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 /Makefile.am | |
| parent | dc9bdb1e2730589ff7c2ec5f1e601f4262eac9d6 (diff) | |
| download | patches-03d0e2d2b9f9cc3be8e871842c11df9453e903bd.tar patches-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 'Makefile.am')
| -rw-r--r-- | Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 1f257a009c..5cee3d3b6f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,7 +27,7 @@ nodist_noinst_SCRIPTS = \ pre-inst-env \ test-env -include gnu-system.am +include gnu/local.mk MODULES = \ guix/base32.scm \ @@ -416,11 +416,11 @@ install-data-hook: set-bootstrap-executable-permissions SUBDIRS = po/guix po/packages BUILT_SOURCES = -include doc.am +include doc/local.mk if BUILD_DAEMON -include daemon.am +include nix/local.mk endif BUILD_DAEMON @@ -437,7 +437,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \ dist_emacsui_DATA = emacs/guix-main.scm nodist_emacsui_DATA = emacs/guix-helper.scm -include emacs.am +include emacs/local.mk # The self-contained tarball. guix-binary.%.tar.xz: |