* Makefile.am: Do not rerun `make dist' after tagging, `make distcheck'

already build the tarballs.  Commit files right before tagging.
Check NEWS before running distcheck.

diff --git a/ChangeLog b/ChangeLog
index 7a1fab4ee45c91d87fbbf1d9d346a8d1d94153d1..092bb28cadedb00f21d4f16ea4c7af0b0ef30c06 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2003-11-11  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * Makefile.am: Do not rerun `make dist' after tagging, `make distcheck'
+       already build the tarballs.  Commit files right before tagging.
+       Check NEWS before running distcheck.
+
        * m4/amversion.in (AM_AUTOMAKE_VERSION): Missing cosmetic space.
 
        * configure.ac, NEWS: Bump version to 1.7c.

diff --git a/HACKING b/HACKING
index 52bb726a68ea2f7e4675cd1c516eb0486beebcd4..f100c4adc7d6646a03710368dec54685781be441 100644 (file)
--- a/HACKING
+++ b/HACKING
@@ -124,13 +124,13 @@
   The repository will always have its own "odd" number so we can easily
   distinguish net and repo versions.)
 
-* Configure, build, and install.
+* Update ChangeLog.
 
-* Run aclocal, automake, and autoconf.
+* Run ./bootstrap, ./configure, make.
 
-* Commit
-
-* Run `make cvs-dist'
+* Run `make cvs-dist'.
+  This will run distcheck to create the tarball, commit the last
+  NEWS/configure.ac/ChangeLog changes, and tag the repository.
 
 * Put new release on ftp site and send announcement to automake list.
   If not an alpha, announcement must also go to FSF:
@@ -140,7 +140,7 @@
   autotools-announce@gnu.org, and automake@gnu.org.
 
 * Update version number in configure.ac to next alpha number.
-  Re-run autoconf and commit.
+  Re-run ./bootstrap and commit.
 
 -----
 

diff --git a/Makefile.am b/Makefile.am
index 3b92a9134dede456fce3574c6861056f77706513..b3229eb7a7a5cd7f60dc6abd6f4f1cc004c115e9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -244,15 +244,24 @@ maintainer-check: automake aclocal
        fi
 
 
-# Tag before making distribution.  Also, don't make a distribution if
-# checks fail.  Also, make sure the NEWS file is up-to-date.
-cvs-dist: maintainer-check distcheck
+cvs-dist: maintainer-check
+## Make sure clcommit exists (we use it at the end of cvs-dist).
+       @if (clcommit --version)>/dev/null 2>/dev/null; then :; else \
+         echo "Get clcommit from module cvs-utils on Savannah."; \
+         exit 1; \
+       fi
+## Make sure the NEWS file is up-to-date.
        @if sed 1q $(srcdir)/NEWS | grep -e "$(VERSION)" > /dev/null; then :; else \
          echo "NEWS not updated; not releasing" 1>&2; \
          exit 1;                               \
        fi
-       cd $(srcdir) && cvs -q tag `echo "Release-$(VERSION)" | sed 's/\./-/g'`
-       $(MAKE) dist
+## Build the distribution
+       $(MAKE) distcheck
+## 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.
+       cd $(srcdir) && clcommit && \
+         cvs -q tag -c `echo "Release-$(VERSION)" | sed 's/\./-/g'`
 
 cvs-diff:
        thisver=`echo "Release-$(VERSION)" | sed 's/\./-/g'`; \

diff --git a/Makefile.in b/Makefile.in
index a6fcfb76e03f10b91e1cee081243930cfbef2e3a..7a130b818f6618e8bddd5f09a80a2cc187bb05eb 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -734,15 +734,18 @@ maintainer-check: automake aclocal
          exit 1; \
        fi
 
-# Tag before making distribution.  Also, don't make a distribution if
-# checks fail.  Also, make sure the NEWS file is up-to-date.
-cvs-dist: maintainer-check distcheck
+cvs-dist: maintainer-check
+       @if (clcommit --version)>/dev/null 2>/dev/null; then :; else \
+         echo "Get clcommit from module cvs-utils on Savannah."; \
+         exit 1; \
+       fi
        @if sed 1q $(srcdir)/NEWS | grep -e "$(VERSION)" > /dev/null; then :; else \
          echo "NEWS not updated; not releasing" 1>&2; \
          exit 1;                               \
        fi
-       cd $(srcdir) && cvs -q tag `echo "Release-$(VERSION)" | sed 's/\./-/g'`
-       $(MAKE) dist
+       $(MAKE) distcheck
+       cd $(srcdir) && clcommit && \
+         cvs -q tag -c `echo "Release-$(VERSION)" | sed 's/\./-/g'`
 
 cvs-diff:
        thisver=`echo "Release-$(VERSION)" | sed 's/\./-/g'`; \