about summary refs log tree commit diff
path: root/src/libmain
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2006-07-20T13·21+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2006-07-20T13·21+0000
commita4273156c43db7325d27cb21e460b57a998ee882 (patch)
tree5df69cee910afca2df45ceb26e5e16ba79b43dee /src/libmain
parent410760c5ab696779bfd26bbd8026827ec436a201 (diff)
* Use $(libexecdir) to find find-runtime-roots.pl.
Diffstat (limited to 'src/libmain')
-rw-r--r--src/libmain/Makefile.am1
-rw-r--r--src/libmain/shared.cc1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/libmain/Makefile.am b/src/libmain/Makefile.am
index 5b90297fe189..ebf64a2fb92a 100644
--- a/src/libmain/Makefile.am
+++ b/src/libmain/Makefile.am
@@ -8,6 +8,7 @@ AM_CXXFLAGS = \
  -DNIX_STATE_DIR=\"$(localstatedir)/nix\" \
  -DNIX_LOG_DIR=\"$(localstatedir)/log/nix\" \
  -DNIX_CONF_DIR=\"$(sysconfdir)/nix\" \
+ -DNIX_LIBEXEC_DIR=\"$(libexecdir)\" \
  -DNIX_VERSION=\"$(VERSION)\" \
  -I$(srcdir)/.. ${aterm_include} -I$(srcdir)/../libutil \
  -I$(srcdir)/../libstore
diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc
index fb24e832980c..d176db7a7855 100644
--- a/src/libmain/shared.cc
+++ b/src/libmain/shared.cc
@@ -92,6 +92,7 @@ static void initAndRun(int argc, char * * argv)
     nixStateDir = canonPath(getEnv("NIX_STATE_DIR", NIX_STATE_DIR));
     nixDBPath = getEnv("NIX_DB_DIR", nixStateDir + "/db");
     nixConfDir = canonPath(getEnv("NIX_CONF_DIR", NIX_CONF_DIR));
+    nixLibexecDir = canonPath(getEnv("NIX_LIBEXEC_DIR", NIX_LIBEXEC_DIR));
 
     thisSystem = querySetting("system", SYSTEM);