diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-04-24 23:19:47 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-04-29 14:09:22 -0400 |
| commit | c8b1799fd7c8d2f08c474d6f6761f40873a0fea1 (patch) | |
| tree | 8ca9d7a16ba52ee427ee04719de1e6b75fb47eeb /Makefile.am | |
| parent | 8214e70fa8da95683cccdf45c674b8be755c27db (diff) | |
Makefile.am: Remove the GUIX_FOR_BINARY_TARBALL variable.
There is no use case where the Guix package is not named 'guix'.
* Makefile.am (GUIX_FOR_BINARY_TARBALL): Remove variable and replace its uses
by 'guix'.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 04b4ed74ed0..216f5b90afd 100644 --- a/Makefile.am +++ b/Makefile.am | |||
| @@ -730,16 +730,13 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \ | |||
| 730 | --enable-daemon \ | 730 | --enable-daemon \ |
| 731 | ac_cv_guix_test_root="$(GUIX_TEST_ROOT)" | 731 | ac_cv_guix_test_root="$(GUIX_TEST_ROOT)" |
| 732 | 732 | ||
| 733 | # Name of the 'guix' package shipped in the binary tarball. | ||
| 734 | GUIX_FOR_BINARY_TARBALL = guix | ||
| 735 | |||
| 736 | # The self-contained tarball. | 733 | # The self-contained tarball. |
| 737 | guix-binary.%.tar.xz: | 734 | guix-binary.%.tar.xz: |
| 738 | $(AM_V_GEN)GUIX_PACKAGE_PATH= \ | 735 | $(AM_V_GEN)GUIX_PACKAGE_PATH= \ |
| 739 | tarball=`$(top_builddir)/pre-inst-env guix pack -C xz \ | 736 | tarball=`$(top_builddir)/pre-inst-env guix pack -C xz \ |
| 740 | --fallback \ | 737 | --fallback \ |
| 741 | -s "$*" --localstatedir --profile-name=current-guix \ | 738 | -s "$*" --localstatedir --profile-name=current-guix \ |
| 742 | $(GUIX_FOR_BINARY_TARBALL)` ; \ | 739 | guix` ; \ |
| 743 | cp "$$tarball" "$@.tmp" ; mv "$@.tmp" "$@" | 740 | cp "$$tarball" "$@.tmp" ; mv "$@.tmp" "$@" |
| 744 | 741 | ||
| 745 | 742 | ||
| @@ -857,7 +854,7 @@ release: dist-with-updated-version | |||
| 857 | "`git rev-parse HEAD`" "$(PACKAGE_VERSION)" | 854 | "`git rev-parse HEAD`" "$(PACKAGE_VERSION)" |
| 858 | git add $(top_srcdir)/gnu/packages/package-management.scm | 855 | git add $(top_srcdir)/gnu/packages/package-management.scm |
| 859 | git commit -m "gnu: guix: Update to $(PACKAGE_VERSION)." | 856 | git commit -m "gnu: guix: Update to $(PACKAGE_VERSION)." |
| 860 | $(top_builddir)/pre-inst-env guix build $(GUIX_FOR_BINARY_TARBALL) \ | 857 | $(top_builddir)/pre-inst-env guix build guix \ |
| 861 | $(call system_flags,$(SUPPORTED_SYSTEMS)) \ | 858 | $(call system_flags,$(SUPPORTED_SYSTEMS)) \ |
| 862 | -v1 --no-grafts --fallback | 859 | -v1 --no-grafts --fallback |
| 863 | rm -f $(BINARY_TARBALLS) | 860 | rm -f $(BINARY_TARBALLS) |
