From bd6163d13f6445b9a1ec0f85e4a19b9f73ab74ea Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin <mthl@openmailbox.org>
Date: Thu, 6 Aug 2015 11:36:53 +0200
Subject: build: Produce 'guix-config' instead of using compile-time tricks.

* emacs/guix-{init,profiles}.el.in: Rename to ...
* emacs/guix-{init,profiles}.el: ... these.  New files.
  Use 'guix-config'.
* emacs/guix-config.el.in: New file.
* emacs.am (nodist_lisp_DATA): Add it.  Move them to ...
  (ELFILES): ... here.
* .gitignore, configure.ac: Adjust accordingly.
---
 emacs.am | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'emacs.am')

diff --git a/emacs.am b/emacs.am
index bf91cca0bb..0f1ac946de 100644
--- a/emacs.am
+++ b/emacs.am
@@ -26,11 +26,13 @@ ELFILES =					\
   emacs/guix-help-vars.el			\
   emacs/guix-history.el				\
   emacs/guix-info.el				\
+  emacs/guix-init.el				\
   emacs/guix-list.el				\
   emacs/guix-messages.el			\
   emacs/guix-pcomplete.el			\
   emacs/guix-popup.el				\
   emacs/guix-prettify.el			\
+  emacs/guix-profiles.el			\
   emacs/guix-read.el				\
   emacs/guix-utils.el				\
   emacs/guix.el
@@ -41,9 +43,7 @@ dist_lisp_DATA =				\
   $(ELFILES)					\
   $(AUTOLOADS)
 
-nodist_lisp_DATA =				\
-  emacs/guix-init.el				\
-  emacs/guix-profiles.el
+nodist_lisp_DATA = emacs/guix-config.el
 
 $(AUTOLOADS): $(ELFILES)
 	$(EMACS) --batch --eval						\
-- 
cgit v1.2.3