Re: [PATCH] release: don't run "make distcheck" automatically

[Stefano Lattarini]

Pushed to maint now (so that I will be able to take advantage
of it in the Automake 1.11.2 release process); attached is the 
definitive patch.

Thanks,
  Stefano

From 9508ef35139a066171cb6aedfa63000482477495 Mon Sep 17 00:00:00 2001
Message-Id: <address@hidden>
From: Stefano Lattarini <address@hidden>
Date: Sat, 10 Dec 2011 18:26:52 +0100
Subject: [PATCH] release: don't run "make distcheck" automatically

* Makefile.am (git-dist): The developers should test extensively
before finally creating the release tarball; so don't run "make
distcheck" on their behalf here; instead ...
* HACKING (Release procedure): ... state here that "make check"
and "make distcheck" should be run before calling "make git-dist".
---
 ChangeLog   |    9 +++++++++
 HACKING     |    2 +-
 Makefile.am |    6 ++++--
 Makefile.in |    2 +-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 618ab02..826a4f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-12-10  Stefano Lattarini  <address@hidden>
+
+       release: don't run "make distcheck" automatically
+       * Makefile.am (git-dist): The developers should test extensively
+       before finally creating the release tarball; so don't run "make
+       distcheck" on their behalf here; instead ...
+       * HACKING (Release procedure): ... state here that "make check"
+       and "make distcheck" should be run before calling "make git-dist".
+
 2011-12-09  Jim Meyering  <address@hidden>
            Stefano Lattarini  <address@hidden>
 
diff --git a/HACKING b/HACKING
index b6f214f..755bffd 100644
--- a/HACKING
+++ b/HACKING
@@ -203,7 +203,7 @@
 
 * Update ChangeLog.
 
-* Run ./bootstrap, ./configure, make.
+* Run "./bootstrap && ./configure && make && make check && make distcheck".
 
 * Run `make release-stats' if release statistics in doc/automake.texi
   have not been updated yet.
diff --git a/Makefile.am b/Makefile.am
index 51eeb23..d0dc846 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -568,8 +568,10 @@ git-dist: maintainer-check
          echo "NEWS not updated; not releasing" 1>&2; \
          exit 1;                               \
        fi
-## Build the distribution
-       $(MAKE) $(AM_MAKEFLAGS) distcheck
+## Build the distribution.  We expect the developer to have already run
+## "make check" and "make distcheck" on his own (as required in the
+## HACKING file, section "Release procedure").
+       $(MAKE) $(AM_MAKEFLAGS) dist
 ## Finally, if anything was successful, commit the last changes and tag
 ## the release in the repository.  We don't use RCS keywords so it's OK
 ## to distribute the files before they were committed.
diff --git a/Makefile.in b/Makefile.in
index e475693..3045353 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1256,7 +1256,7 @@ git-dist: maintainer-check
          echo "NEWS not updated; not releasing" 1>&2; \
          exit 1;                               \
        fi
-       $(MAKE) $(AM_MAKEFLAGS) distcheck
+       $(MAKE) $(AM_MAKEFLAGS) dist
        cd $(srcdir) && git commit -a -s && \
           git tag -s "v$(VERSION)" -m "Release $(VERSION)"
 
-- 
1.7.2.3