diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-03-10 23:54:17 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-03-10 23:54:17 +0100 |
| commit | e06f7865e2630494a522ac32b9c0a0311be3e1e2 (patch) | |
| tree | 1a547ad3a2e4c1b98a67845a9de0dfc798227b5f /daemon.am | |
| parent | ff3c0c1b805453990a42f690f148b41b9dff382a (diff) | |
| parent | c9c88118a12b0e22b7369b1dc6b0e2f9db894986 (diff) | |
| download | guix-e06f7865e2630494a522ac32b9c0a0311be3e1e2.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'daemon.am')
| -rw-r--r-- | daemon.am | 4 |
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)\" \ |