diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-03-15 17:52:26 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-03-15 17:52:26 +0100 |
| commit | 4b7e5c1131430f10e6211879836cf17447ef5bbc (patch) | |
| tree | 54155070ec4044a78c1abf20f879fded47b5baf2 /Makefile.am | |
| parent | adb984d23c003d5d48ada47bf5ad8105a3b8e412 (diff) | |
| parent | 608e42e7c92114497e7908980424288079acee1e (diff) | |
| download | patches-4b7e5c1131430f10e6211879836cf17447ef5bbc.tar patches-4b7e5c1131430f10e6211879836cf17447ef5bbc.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 2443f6891f..4d7bc1caeb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -298,6 +298,7 @@ SCM_TESTS = \ tests/services.scm \ tests/scripts-build.scm \ tests/containers.scm \ + tests/pack.scm \ tests/import-utils.scm if HAVE_GUILE_JSON @@ -489,7 +490,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \ guix-binary.%.tar.xz: $(AM_V_GEN)GUIX_PACKAGE_PATH= \ tarball=`$(top_builddir)/pre-inst-env guix pack -C xz \ - -s "$*" guix` ; \ + -s "$*" --localstatedir guix` ; \ cp "$$tarball" "$@.tmp" ; mv "$@.tmp" "$@" |