From 7994250fdb7ce786a72278554d85fccb6d152e73 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Fri, 17 Feb 2017 13:28:16 +0300 Subject: gnu: linux: Move configuration files to "aux-files". * gnu/packages/linux-libre-4.1-i686.conf: Rename to... * gnu/packages/aux-files/linux-libre/4.1-i686.conf: ... this. * gnu/packages/linux-libre-4.1-x86_64.conf: Rename to... * gnu/packages/aux-files/linux-libre/4.1-x86_64.conf: ... this. * gnu/packages/linux-libre-4.4-i686.conf: Rename to... * gnu/packages/aux-files/linux-libre/4.4-i686.conf: ... this. * gnu/packages/linux-libre-4.4-x86_64.conf: Rename to... * gnu/packages/aux-files/linux-libre/4.4-x86_64.conf: ... this. * gnu/packages/linux-libre-4.9-i686.conf: Rename to... * gnu/packages/aux-files/linux-libre/4.9-i686.conf: ... this. * gnu/packages/linux-libre-4.9-x86_64.conf: Rename to... * gnu/packages/aux-files/linux-libre/4.9-x86_64.conf: ... this. * gnu/packages/linux-libre-4.10-i686.conf: Rename to... * gnu/packages/aux-files/linux-libre/4.10-i686.conf: ... this. * gnu/packages/linux-libre-4.10-x86_64.conf: Rename to... * gnu/packages/aux-files/linux-libre/4.10-x86_64.conf: ... this. * gnu/packages/linux.scm (kernel-config): Use 'search-auxiliary-file' to find configuration files. * Makefile.am (KCONFIGS): Rename to... (AUX_FILES): ... this. Adjust accordingly. --- Makefile.am | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 0de2e0987c..2e048f99ae 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ # GNU Guix --- Functional package management for GNU # Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès # Copyright © 2013 Andreas Enge -# Copyright © 2015 Alex Kost +# Copyright © 2015, 2017 Alex Kost # Copyright © 2016 Mathieu Lirzin # Copyright © 2016, 2017 Mark H Weaver # @@ -196,16 +196,16 @@ endif BUILD_DAEMON_OFFLOAD # Internal modules with test suite support. dist_noinst_DATA = guix/tests.scm guix/tests/http.scm -# Linux-Libre configurations. -KCONFIGS = \ - gnu/packages/linux-libre-4.10-i686.conf \ - gnu/packages/linux-libre-4.10-x86_64.conf \ - gnu/packages/linux-libre-4.9-i686.conf \ - gnu/packages/linux-libre-4.9-x86_64.conf \ - gnu/packages/linux-libre-4.4-i686.conf \ - gnu/packages/linux-libre-4.4-x86_64.conf \ - gnu/packages/linux-libre-4.1-i686.conf \ - gnu/packages/linux-libre-4.1-x86_64.conf +# Auxiliary files for packages. +AUX_FILES = \ + gnu/packages/aux-files/linux-libre/4.10-i686.conf \ + gnu/packages/aux-files/linux-libre/4.10-x86_64.conf \ + gnu/packages/aux-files/linux-libre/4.9-i686.conf \ + gnu/packages/aux-files/linux-libre/4.9-x86_64.conf \ + gnu/packages/aux-files/linux-libre/4.4-i686.conf \ + gnu/packages/aux-files/linux-libre/4.4-x86_64.conf \ + gnu/packages/aux-files/linux-libre/4.1-i686.conf \ + gnu/packages/aux-files/linux-libre/4.1-x86_64.conf # Templates, examples. EXAMPLES = \ @@ -216,7 +216,7 @@ EXAMPLES = \ GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go $(dist_noinst_DATA:%.scm=%.go) nobase_dist_guilemodule_DATA = \ - $(MODULES) $(KCONFIGS) $(EXAMPLES) \ + $(MODULES) $(AUX_FILES) $(EXAMPLES) \ $(MISC_DISTRO_FILES) nobase_nodist_guilemodule_DATA = $(GOBJECTS) guix/config.scm -- cgit v1.2.3 From 59d04f63dfe8b68906e4cccc60ca27cbd546db78 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Sat, 18 Feb 2017 11:24:41 +0300 Subject: gnu: emacs: Move "guix-emacs.el" to "aux-files". * emacs/guix-emacs.el: Rename to... * gnu/packages/aux-files/emacs/guix-emacs.el: ... this. * Makefile.am (AUX_FILES): Add it. * gnu/packages/emacs.scm (emacs)[inputs]: Remove 'guix' source. [native-inputs]: Add "guix-emacs.el" auxiliary file. [arguments]: Adjust 'install-site-start' phase accordingly. --- Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 2e048f99ae..ec1bd2eb8b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -198,6 +198,7 @@ dist_noinst_DATA = guix/tests.scm guix/tests/http.scm # Auxiliary files for packages. AUX_FILES = \ + gnu/packages/aux-files/emacs/guix-emacs.el \ gnu/packages/aux-files/linux-libre/4.10-i686.conf \ gnu/packages/aux-files/linux-libre/4.10-x86_64.conf \ gnu/packages/aux-files/linux-libre/4.9-i686.conf \ -- cgit v1.2.3