summaryrefslogtreecommitdiff
path: root/daemon.am
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-03-09 22:05:29 +0100
committerLudovic Courtès <ludo@gnu.org>2014-03-09 22:10:01 +0100
commitf5768afa333bbc8167ef2e33db44c9bb64bef0be (patch)
treeb44b74586c82b3f4637512228664e44f214e31a1 /daemon.am
parent834129e0e2984fa615c8958de3964dabd7f6972c (diff)
downloadpatches-f5768afa333bbc8167ef2e33db44c9bb64bef0be.tar
patches-f5768afa333bbc8167ef2e33db44c9bb64bef0be.tar.gz
build: Change state and log directories to $localstatedir/.../guix.
* daemon.am (libstore_a_CPPFLAGS): Change /nix to /guix. * guix/config.scm.in (%state-directory): Likewise. * guix/store.scm (log-file): Likewise.
Diffstat (limited to 'daemon.am')
-rw-r--r--daemon.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/daemon.am b/daemon.am
index 1059e444ab..abb785592d 100644
--- a/daemon.am
+++ b/daemon.am
@@ -112,8 +112,8 @@ libstore_a_CPPFLAGS = \
-I$(top_builddir)/nix/libstore \
-DNIX_STORE_DIR=\"$(storedir)\" \
-DNIX_DATA_DIR=\"$(datadir)\" \
- -DNIX_STATE_DIR=\"$(localstatedir)/nix\" \
- -DNIX_LOG_DIR=\"$(localstatedir)/log/nix\" \
+ -DNIX_STATE_DIR=\"$(localstatedir)/guix\" \
+ -DNIX_LOG_DIR=\"$(localstatedir)/log/guix\" \
-DNIX_CONF_DIR=\"$(sysconfdir)/guix\" \
-DNIX_LIBEXEC_DIR=\"$(libexecdir)\" \
-DNIX_BIN_DIR=\"$(bindir)\" \