* Makefile.maint (cvs-check, cvs-tag-check, cvs-diff-check): New.

diff --git a/ChangeLog b/ChangeLog
index 747187e4153eef41a7858b99df7cdfeb5929396e..cbb02579b99b9235a9af4727ce244bde0135c6ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-14  Akim Demaille  <akim@epita.fr>
+
+       * Makefile.maint (cvs-check, cvs-tag-check, cvs-diff-check): New.
+
 2001-07-14  Akim Demaille  <akim@epita.fr>
 
        * Makefile.maint (maintainer-check): Rename as...
@@ -7,7 +11,7 @@
 
 2001-07-14  Kevin Ryde  <user42@zip.com.au>
 
-        * doc/autoconf.texi (C++ Compilers Characteristics): Last resort
+       * doc/autoconf.texi (C++ Compilers Characteristics): Last resort
        for CXX is g++, not gcc.
 
 2001-07-14  Akim Demaille  <akim@epita.fr>

diff --git a/Makefile.maint b/Makefile.maint
index e698a07530ea819361dfcb72e67c25a818a3a793..b5238b09db14708e61401338a70ce80f4a466190 100644 (file)
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -29,7 +29,7 @@ changelog-check:
        if head ChangeLog | grep 'Version $(VERSION)' >/dev/null; then \
          :; \
        else \
-         echo "$(VERSION) not in ChangeLog; not tagging" 1>&2; \
+         echo "$(VERSION) not in ChangeLog" 1>&2; \
          exit 1; \
        fi
 
@@ -56,9 +56,29 @@ writable-files:
        done;                                                           \
        test "$$fail" && exit 1 || :
 
-static-check: changelog-check po-check writable-files check-copyright
+# Checks that don't require cvs.
+local-check: changelog-check po-check writable-files check-copyright
 
 
+# Sanity checks with the CVS repository.
+cvs-tag-check:
+       echo $(this-cvs-tag); \
+       if cvs -n log -h README | grep -e $(this-cvs-tag): >/dev/null; then \
+         echo "$(this-cvs-tag) as already been used; not tagging" 1>&2; \
+         exit 1; \
+       else :; fi
+
+cvs-diff-check:
+       if cvs diff >cvs-diffs; then                            \
+         rm cvs-diffs;                                         \
+       else                                                    \
+         echo "Some files are locally modified:" 1>&2;         \
+         cat cvs-diffs;                                        \
+         exit 1;                                               \
+       fi
+
+cvs-check: cvs-diff-check cvs-tag-check
+
 maintainer-distcheck: changelog-check
        $(MAKE) distcheck
        $(MAKE) my-distcheck
@@ -73,13 +93,8 @@ AMTAR ?= $(TAR)
 # Tag before making distribution.  Also, don't make a distribution if
 # checks fail.  Also, make sure the NEWS file is up-to-date.
 # FIXME: use dist-hook/my-dist like distcheck-hook/my-distcheck.
-cvs-dist: maintainer-distcheck
-       echo $(this-cvs-tag); \
-       if cvs -n log -h README| grep -e $(this-cvs-tag): > /dev/null; then \
-         echo "VERSION not new; not tagging" 1>&2; \
-         exit 1; \
-       fi; \
-       cvs update po; \
+cvs-dist: cvs-check maintainer-distcheck
+       cvs update po
        cvs tag -c $(this-cvs-tag)
        $(MAKE) dist
 
@@ -235,7 +250,7 @@ check-copyright:
 alpha: static-check
        $(MAKE) cvs-dist
        $(MAKE) -s announcement > /tmp/announce-$(my_distdir)
-       ln $(distdir).tar.gz ../release
+       ln $(distdir).tar.gz $(release-archive-dir)
        chmod a-w $(distdir).tar.gz
        cd $(release-archive-dir) \
          && xdelta delta -9 $(prev-tgz) $(distdir).tar.gz $(xd-delta) || :

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 6337c809769a92ecba7e080c9dd880b9c2d4cde0..8c60d00d32b86c4f6cd7a078ee0457107f3507e1 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -9586,7 +9586,7 @@ understanding how to move to more modern constructs.
 * autoupdate Invocation::       Automatic update of @file{configure.ac}
 * Obsolete Macros::             Backward compatibility macros
 * Autoconf 1::                  Tips for upgrading your files
-* Autoconf 2.13::
+* Autoconf 2.13::               Some fresher tips
 @end menu
 
 @node Obsolete config.status Use, acconfig.h, Obsolete Constructs, Obsolete Constructs