From 808084e9d1ba7d78621bf4c441c7ddb616849683 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 9 Apr 2020 11:31:42 +0200 Subject: maint: Binary tarball uses "guile3.0-guix", not "guix". * Makefile.am (GUIX_FOR_BINARY_TARBALL): New variable. (guix-binary.%.tar.xz): Use $(GUIX_FOR_BINARY_TARBALL) instead of "guix". (release): Likewise. --- Makefile.am | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 344ecdbc42..94348ff00d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -662,11 +662,15 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \ --enable-daemon \ ac_cv_guix_test_root="$(GUIX_TEST_ROOT)" +# Name of the 'guix' package shipped in the binary tarball. +GUIX_FOR_BINARY_TARBALL = guile3.0-guix + # The self-contained tarball. guix-binary.%.tar.xz: $(AM_V_GEN)GUIX_PACKAGE_PATH= \ tarball=`$(top_builddir)/pre-inst-env guix pack -K -C xz \ - -s "$*" --localstatedir --profile-name=current-guix guix` ; \ + -s "$*" --localstatedir --profile-name=current-guix \ + $(GUIX_FOR_BINARY_TARBALL)` ; \ cp "$$tarball" "$@.tmp" ; mv "$@.tmp" "$@" @@ -769,7 +773,7 @@ release: dist "`git rev-parse HEAD`" "$(PACKAGE_VERSION)" git add $(top_srcdir)/gnu/packages/package-management.scm git commit -m "gnu: guix: Update to $(PACKAGE_VERSION)." - $(top_builddir)/pre-inst-env guix build guix \ + $(top_builddir)/pre-inst-env guix build $(GUIX_FOR_BINARY_TARBALL) \ $(call system_flags,$(SUPPORTED_SYSTEMS)) \ -v1 --no-grafts -K rm -f $(BINARY_TARBALLS) -- cgit v1.2.3