diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-05-08 14:56:36 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-05-08 16:29:23 +0200 |
| commit | ddce2d3aaea804604a32e6c4b70d78e6cc033df3 (patch) | |
| tree | 8c6d14b9598bc70138852bb02d52d7f8958128b7 | |
| parent | c8ba269c26c85c5eae6bf5be9add881111c18a22 (diff) | |
| download | guix-ddce2d3aaea804604a32e6c4b70d78e6cc033df3.tar.gz guix-ddce2d3aaea804604a32e6c4b70d78e6cc033df3.zip | |
maint: "distcheck" inherits the test root directory.
* Makefile.am (AM_DISTCHECK_CONFIGURE_FLAGS): Add 'ac_cv_guix_test_root'.
| -rw-r--r-- | Makefile.am | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index e035045468..6cc179f95f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -493,13 +493,17 @@ 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. +# it finds an existing installation with a different localstatedir. Inherit +# 'ac_cv_guix_test_root' so that "make check" in $(distdir) does not have to +# repopulate the whole store, and to make sure $(GUIX_TEST_ROOT) is short +# enough for shebangs. AM_DISTCHECK_CONFIGURE_FLAGS = \ --localstatedir="$$dc_install_base/var" \ --with-libgcrypt-prefix="$(LIBGCRYPT_PREFIX)" \ --with-libgcrypt-libdir="$(LIBGCRYPT_LIBDIR)" \ --with-nix-prefix="$(NIX_PREFIX)" \ - --enable-daemon + --enable-daemon \ + ac_cv_guix_test_root="$(GUIX_TEST_ROOT)" # The self-contained tarball. Add 'glibc-utf8-locales' along with glibc just # so 'etc/profile' defines 'GUIX_LOCPATH' pointing to a valid set of locales. |