branch version-1.1.0 updated: maint: 'release' targets runs ./bootstrap for new version string.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

civodul pushed a commit to branch version-1.1.0
in repository guix.

The following commit(s) were added to refs/heads/version-1.1.0 by this push:
     new 08b14ab  maint: 'release' targets runs ./bootstrap for new version 
string.
08b14ab is described below

commit 08b14ab20ebe181690df6210a0b3f95bad494af5
Author: Ludovic Courtès <address@hidden>
AuthorDate: Fri Apr 10 12:26:21 2020 +0200

    maint: 'release' targets runs ./bootstrap for new version string.
    
    Reported by Vagrant Cascadian <address@hidden>.
    
    * Makefile.am (dist-with-updated-version): New target.
    (release): Depend on 'dist-with-updated-version'.
---
 Makefile.am | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 654734a..36f23b4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -705,6 +705,16 @@ gen-AUTHORS:
            "$(top_srcdir)" "$(distdir)/AUTHORS";               \
        fi
 
+# Like 'dist', but regenerate 'configure' so we get an up-to-date
+# 'PACKAGE_VERSION' string.  (In Gnulib, 'GNUmakefile' has a special trick to
+# do that whenever a 'dist' target is used.)
+dist-with-updated-version:
+       @echo "Running './bootstrap' for new version string..."
+       $(top_srcdir)/bootstrap
+       $(MAKE) $(AM_MAKEFLAGS) $(top_srcdir)/.version dist
+
+.PHONY: dist-with-updated-version
+
 
 #
 # Release management.
@@ -760,7 +770,7 @@ system_flags = $(foreach system,$(1),-s $(system))
 #
 # XXX: Depend on 'dist' rather than 'distcheck' to work around the Gettext
 # issue described at <https://savannah.gnu.org/bugs/index.php?51027>.
-release: dist
+release: dist-with-updated-version
        cd po; git checkout .
        @if ! git diff-index --quiet HEAD; then                 \
          echo "There are uncommitted changes; stopping." >&2 ; \