The purpose of these patches is to fix
http://debbugs.gnu.org/cgi/bugreport.cgi?bug=21127 with a more elegant
solution than adding another '*.in' file to the build system.  My limited
knowledge of ELisp has made me unable to properly test them, so I will be
happy to hear Alex suggestions. ;)


Mathieu Lirzin (4):
  build: Add more variables to (guix config).
  build: Produce 'guix-config' instead of using compile-time tricks.
  emacs: Move guix-guile-program to 'guix-config'.
  emacs: Use only one guix-load-path variable.

 .gitignore                |  4 +--
 configure.ac              | 20 +++++++-------
 emacs/guix-backend.el     | 15 +----------
 emacs/guix-config.el.in   | 46 +++++++++++++++++++++++++++++++++
 emacs/guix-helper.scm     | 66 +++++++++++++++++++++++++++++++++++++++++++++++
 emacs/guix-helper.scm.in  | 65 ----------------------------------------------
 emacs/guix-init.el        | 16 ++++++++++++
 emacs/guix-init.el.in     | 19 --------------
 emacs/guix-profiles.el    | 65 ++++++++++++++++++++++++++++++++++++++++++++++
 emacs/guix-profiles.el.in | 62 --------------------------------------------
 guix/config.scm.in        | 11 +++++++-
 11 files changed, 214 insertions(+), 175 deletions(-)
 create mode 100644 emacs/guix-config.el.in
 create mode 100644 emacs/guix-helper.scm
 delete mode 100644 emacs/guix-helper.scm.in
 create mode 100644 emacs/guix-init.el
 delete mode 100644 emacs/guix-init.el.in
 create mode 100644 emacs/guix-profiles.el
 delete mode 100644 emacs/guix-profiles.el.in

-- 
2.4.3