diff options
| author | Mathieu Lirzin <mthl@gnu.org> | 2016-04-21 18:07:52 +0200 |
|---|---|---|
| committer | Mathieu Lirzin <mthl@gnu.org> | 2016-04-21 18:47:50 +0200 |
| commit | 03d0e2d2b9f9cc3be8e871842c11df9453e903bd (patch) | |
| tree | a7cf97b70bf769217609beff73ec0c073d3f57f8 /guix/config.scm.in | |
| parent | dc9bdb1e2730589ff7c2ec5f1e601f4262eac9d6 (diff) | |
| download | gnu-guix-03d0e2d2b9f9cc3be8e871842c11df9453e903bd.tar gnu-guix-03d0e2d2b9f9cc3be8e871842c11df9453e903bd.tar.gz | |
build: Move 'Makefile' fragments to subdirectories.
This follows a convention used by some other GNU packages like Autoconf,
Bison, Coreutils, and Gnulib.
* doc.am: Rename to ...
* doc/local.mk: ... this.
* emacs.am: Rename to ...
* emacs/local.mk: ... this.
* gnu-system.am: Rename to ...
* gnu/local.mk: ... this.
* daemon.am: Rename to ...
* nix/local.mk: ... this.
* Makefile.am: Adapt to them.
* doc/guix.texi (Porting to a New Platform): Adapt documentation.
* guix/config.scm.in (%state-directory, %config-directory): Adapt comments.
* emacs/guix-config.el.in (guix-config-state-directory): Likewise.
Diffstat (limited to 'guix/config.scm.in')
| -rw-r--r-- | guix/config.scm.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/guix/config.scm.in b/guix/config.scm.in index 764e466bc5..d7df9f7d2b 100644 --- a/guix/config.scm.in +++ b/guix/config.scm.in @@ -55,11 +55,11 @@ "@storedir@")) (define %state-directory - ;; This must match `NIX_STATE_DIR' as defined in `daemon.am'. + ;; This must match `NIX_STATE_DIR' as defined in `nix/local.mk'. (or (getenv "NIX_STATE_DIR") "@guix_localstatedir@/guix")) (define %config-directory - ;; This must match `NIX_CONF_DIR' as defined in `daemon.am'. + ;; This must match `NIX_CONF_DIR' as defined in `nix/local.mk'. (or (getenv "NIX_CONF_DIR") "@guix_sysconfdir@/guix")) (define %guix-register-program |