diff options
author | Mark H Weaver <mhw@netris.org> | 2014-09-08 11:00:06 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2014-09-08 11:00:06 -0400 |
commit | e759c0a38c799f2d03b3454e9ca6acf2262dc957 (patch) | |
tree | 08f5a1414410bc6719205090ac07484b308ba918 /configure.ac | |
parent | 11459384968f654c42ad7dba4443dada35191f5b (diff) | |
parent | 4a4cbd0bdd2ad8c4f37c3ffdd69596ef1ef41d91 (diff) | |
download | guix-e759c0a38c799f2d03b3454e9ca6acf2262dc957.tar guix-e759c0a38c799f2d03b3454e9ca6acf2262dc957.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 71b3ddacaa..698dd85784 100644 --- a/configure.ac +++ b/configure.ac @@ -174,4 +174,11 @@ AC_CONFIG_FILES([scripts/guix], [chmod +x scripts/guix]) AC_CONFIG_FILES([pre-inst-env], [chmod +x pre-inst-env]) AC_CONFIG_FILES([test-env], [chmod +x test-env]) +dnl Emacs interface. +AM_PATH_LISPDIR +emacsuidir="${guilemoduledir}/guix/emacs" +AC_SUBST([emacsuidir]) +AC_CONFIG_FILES([emacs/guix-init.el + emacs/guix-helper.scm]) + AC_OUTPUT |