diff options
author | Ludovic Courtès <ludo@gnu.org> | 2013-01-06 17:33:02 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2013-01-06 17:33:02 +0100 |
commit | 4050e5d6cfe8f7af29f10b2f1b3c7febdc10946a (patch) | |
tree | 574828c84e7bfb0b6850db4f30fc38bd8143584e /configure.ac | |
parent | 79580eb698d07e4b21334ddfbcbcf620d27b5e41 (diff) | |
parent | 233e76769ae3a438bff7117c68f2c88739a28db0 (diff) | |
download | guix-4050e5d6cfe8f7af29f10b2f1b3c7febdc10946a.tar guix-4050e5d6cfe8f7af29f10b2f1b3c7febdc10946a.tar.gz |
Merge branch 'master' into core-updates
Conflicts:
build-aux/download.scm
distro/packages/autotools.scm
distro/packages/base.scm
distro/packages/bootstrap.scm
distro/packages/lsh.scm
distro/packages/make-bootstrap.scm
distro/packages/ncurses.scm
distro/packages/perl.scm
tests/derivations.scm
tests/union.scm
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index bebb9885c4..0c3a9e5f6f 100644 --- a/configure.ac +++ b/configure.ac @@ -114,10 +114,12 @@ AC_CONFIG_FILES([Makefile guix-download guix-import guix-package + guix-gc pre-inst-env test-env]) AC_CONFIG_COMMANDS([commands-exec], - [chmod +x guix-build guix-download guix-import guix-package pre-inst-env test-env]) + [chmod +x guix-build guix-download guix-import guix-package guix-gc \ + pre-inst-env test-env]) AC_OUTPUT |