diff options
| author | Leo Famulari <leo@famulari.name> | 2016-03-21 12:22:31 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2016-03-21 12:22:31 -0400 |
| commit | 09ec508a4c14d1bc09622d98f796548d79ab0552 (patch) | |
| tree | 86cc5a2a67d35ad796bfa33d67869d670d65822e /Makefile.am | |
| parent | 2dbed47f5c09347c9af42c5f5bacfccbc1ab4aff (diff) | |
| parent | 71cafa0472a15f2234e24d3c6d8019ebb38685b0 (diff) | |
| download | guix-09ec508a4c14d1bc09622d98f796548d79ab0552.tar guix-09ec508a4c14d1bc09622d98f796548d79ab0552.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 4c53779aaa..a9c281d4d1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -56,6 +56,7 @@ MODULES = \ guix/graph.scm \ guix/cve.scm \ guix/build-system.scm \ + guix/build-system/ant.scm \ guix/build-system/cmake.scm \ guix/build-system/emacs.scm \ guix/build-system/glib-or-gtk.scm \ @@ -75,6 +76,7 @@ MODULES = \ guix/cvs-download.scm \ guix/svn-download.scm \ guix/ui.scm \ + guix/build/ant-build-system.scm \ guix/build/download.scm \ guix/build/cmake-build-system.scm \ guix/build/emacs-build-system.scm \ @@ -109,7 +111,6 @@ MODULES = \ guix/import/cran.scm \ guix/import/hackage.scm \ guix/import/elpa.scm \ - guix/import/github.scm \ guix/scripts.scm \ guix/scripts/download.scm \ guix/scripts/build.scm \ @@ -143,6 +144,7 @@ MODULES = \ if HAVE_GUILE_JSON MODULES += \ + guix/import/github.scm \ guix/import/json.scm \ guix/import/pypi.scm \ guix/scripts/import/pypi.scm \ @@ -171,8 +173,10 @@ dist_noinst_DATA = guix/tests.scm # Linux-Libre configurations. KCONFIGS = \ - gnu/packages/linux-libre-i686.conf \ - gnu/packages/linux-libre-x86_64.conf \ + gnu/packages/linux-libre-4.5-i686.conf \ + gnu/packages/linux-libre-4.5-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 @@ -225,6 +229,7 @@ SCM_TESTS = \ tests/grafts.scm \ tests/ui.scm \ tests/records.scm \ + tests/upstream.scm \ tests/utils.scm \ tests/build-utils.scm \ tests/packages.scm \ @@ -416,7 +421,11 @@ include daemon.am endif BUILD_DAEMON ACLOCAL_AMFLAGS = -I m4 + +# Pass an explicit '--localstatedir' so that configure does not error out if +# it finds an existing installation with a different localstatedir. AM_DISTCHECK_CONFIGURE_FLAGS = \ + --localstatedir="$$dc_install_base/var" \ --with-libgcrypt-prefix="$(LIBGCRYPT_PREFIX)" \ --with-libgcrypt-libdir="$(LIBGCRYPT_LIBDIR)" \ --with-nix-prefix="$(NIX_PREFIX)" \ |