* Use $(libexecdir) to find find-runtime-roots.pl.
This commit is contained in:
parent
410760c5ab
commit
a4273156c4
5 changed files with 8 additions and 1 deletions
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue