last patches for 1.4.6

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Here's the patches I applied to get to 1.4.6.  I also updated HACKING to
show what it took, but as it is not distributed, it is not listed in the
ChangeLog.  Expect the release announcement once I verify the upload worked.

2006-08-25  Eric Blake  <address@hidden>

        * Makefile.maint (web-manual): Give up on VPATH build during
        distribution.  But distributions are made so infrequently that
        this is not too much of a hardship.
        * Makefile.am (MAINTAINERCLEANFILES): Avoid error if lib/CVS/
        exists.

2006-08-25  Eric Blake  <address@hidden>

        Release 1.4.6:

        * configure.ac (AC_INIT): Bump version number.
        * NEWS: Describe changes since 1.4.5.

- --
Life is short - so eat dessert first!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.1 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFE7wXu84KuGfSFAYARAsklAJ9epoWhYGwlVa7iUutExW9yv78q9QCfdyyw
4WIXivz3aDqNI3Kh3GrkEOQ=
=3AwX
-----END PGP SIGNATURE-----

Index: Makefile.am
===================================================================
RCS file: /sources/m4/m4/Makefile.am,v
retrieving revision 1.25.2.10
diff -u -p -r1.25.2.10 Makefile.am
--- Makefile.am 28 Jul 2006 20:39:37 -0000      1.25.2.10
+++ Makefile.am 25 Aug 2006 14:00:06 -0000
@@ -28,8 +28,8 @@ DISTCLEANFILES = stamp-h
 ## recreate.  In the m4 directory, keep only gnulib-cache.m4.
 MAINTAINERCLEANFILES = COPYING INSTALL Makefile.in aclocal.m4 \
        config-h.in configure depcomp doc/fdl.texi gendocs.sh install-sh \
-       lib/* m4/[a-fh-z]* m4/g[a-mo-z]* m4/gnulib-comp.m4 m4/gnulib-tool.m4 \
-       missing stamp-h.in
+       lib/[a-z]* m4/[a-fh-z]* m4/g[a-mo-z]* m4/gnulib-comp.m4 \
+       m4/gnulib-tool.m4 missing stamp-h.in
 
 ACLOCAL_AMFLAGS = -I m4
 DISTCHECK_CONFIGURE_FLAGS = --enable-changeword
Index: Makefile.maint
===================================================================
RCS file: /sources/m4/m4/Attic/Makefile.maint,v
retrieving revision 1.1.2.8
diff -u -p -r1.1.2.8 Makefile.maint
--- Makefile.maint      22 Aug 2006 20:32:58 -0000      1.1.2.8
+++ Makefile.maint      25 Aug 2006 14:00:06 -0000
@@ -140,7 +140,7 @@ delta-xdelta: prev-tarball new-tarball g
 
 .PHONY: web-manual
 web-manual:
-       @cd "$(abs_srcdir)/doc"; \
-         $(SHELL) "$(abs_srcdir)/gendocs.sh" $(PACKAGE) \
+       @cd ./doc ; \
+         $(SHELL) ../gendocs.sh $(PACKAGE) \
            "GNU $(PACKAGE)- GNU macro processor"
        @echo " *** Upload the doc/manual directory to web-cvs."

Index: HACKING
===================================================================
RCS file: /sources/m4/m4/HACKING,v
retrieving revision 1.1.2.3
diff -u -p -r1.1.2.3 HACKING
--- HACKING     22 Aug 2006 20:32:58 -0000      1.1.2.3
+++ HACKING     25 Aug 2006 14:01:47 -0000
@@ -162,13 +162,19 @@ yyyy-mm-dd  Name of Author  <address@hidden
 * If you do not have access to the mailing list administrative interface,
   approach the list owners for the password.  Be sure to check the lists
   (esp. bug-m4) for outstanding bug reports also in the list of
-  pending moderation requests.  This step is not strictly necessary.
+  pending moderation requests.  This step is not strictly necessary, but
+  helps, since by default, m4-announce rejects all posts, so you have to
+  get an administrator to allow your announcement through.
 
 * Make sure you have wget installed.
 
 * Make sure you have a copy of xdelta installed, and a copy of the previous
   release tarball in the build directory.
 
+* Make sure you have GNU make installed.
+
+* Make sure you have an up-to-date version of help2man installed.
+
 * Make sure your locale is sane, e.g. by exporting LC_ALL=C.
 
 * Update the version number in configure.ac.
@@ -179,25 +185,28 @@ yyyy-mm-dd  Name of Author  <address@hidden
 
 * Run ./bootstrap.
 
-* Run ./configure (or create a build directory first and run configure
-  from there, if you want to keep the build tree separate).
+* Run ./configure (a VPATH build is not recommended, since several
+  targets in GNUMakefile and Makefile.maint assume an in-tree build for
+  distribution purposes.  Normal builds do not suffer from this
+  restriction, and make distcheck ensures VPATH still works).
+
+* Run `make'.  The file doc/m4.1 needs to exist for a distribution, and
+  be up-to-date with m4 --help output, but `make dist' intentionally
+  does not depend on running a built binary.
 
 * Run `make distcheck'.  If there are any problems, fix them and start
   again.
 
 * Run ./commit from the source tree.
 
-* Run `make -fMakefile.maint cvs-dist' (or `make -f../Makefile.maint
-  cvs-dist' if you are running from a VPATH build directory, where `../'
-  is the relative path to the directory with `configure' in it), which
-  will build a release tarball (with `make distcheck') and tag the tree
-  with release-$(VERSION).
-
-* Run 'make -f[../]Makefile.maint deltas' (pass
-  LASTRELEASE=maj.min[.mic[alpha]] if needed) to create both diff and
-  xdelta files between the previous release tarball and the new.
+* Run `make cvs-dist', which will build a release tarball (with `make
+  distcheck') and tag the tree with release-$(VERSION).
+
+* Run `make deltas' (pass LASTRELEASE=maj.min[.mic[alpha]] if needed) to
+  create both diff and xdelta files between the previous release tarball
+  and the new.
 
-* Run '[../]./gnupload --to [dest].gnu.org:m4 [files]' to create
+* Run './gnupload --to [dest].gnu.org:m4 [files]' to create
   detached gpg signature and clear signed directive files, and upload
   the combination to the correct location.  For an alpha release,
   gnupload will place files in alpha.gnu.org, in /incoming/alpha, and
@@ -206,7 +215,10 @@ yyyy-mm-dd  Name of Author  <address@hidden
 
 * Send announcement to address@hidden, address@hidden, and
   address@hidden  If not an alpha send to address@hidden
-  as well.
+  as well.  Use the templates below as a starting point.  Contact a list
+  administrator for m4-announce in advance to ensure your post will
+  make it through (the list is normally set to silently discard all
+  posts, even from subscribers).
 
 * Update version number in configure.ac to next alpha number.
   See http://www.gnu.org/software/libtool/contribute.html for details of
@@ -217,7 +229,7 @@ yyyy-mm-dd  Name of Author  <address@hidden
 * Run ./commit.
 
 * For non-alpha releases, update the webpages.  Replace manual.html with
-  the new one (generate with `make -f[../]Makefile.maint web-manual').
+  the new one (generate with `make web-manual').
 
 
 7. Alpha release note template

Index: NEWS
===================================================================
RCS file: /sources/m4/m4/NEWS,v
retrieving revision 1.1.1.1.2.56
diff -u -p -r1.1.1.1.2.56 NEWS
--- NEWS        24 Aug 2006 14:27:33 -0000      1.1.1.1.2.56
+++ NEWS        25 Aug 2006 14:06:58 -0000
@@ -2,7 +2,7 @@ GNU M4 NEWS - User visible changes.
 Copyright (C) 1992, 1993, 1994, 2004, 2005, 2006 Free Software
 Foundation, Inc.
 
-Version 1.4.6 - ?? 2006, by ??  (CVS version 1.4.5a)
+Version 1.4.6 - 25 August 2006, by Eric Blake  (CVS version 1.4.5a)
 
 * Fix buffer overruns in regexp and patsubst macros when handed a trailing
   backslash in the replacement text, or when handling \n substitutions
Index: configure.ac
===================================================================
RCS file: /sources/m4/m4/configure.ac,v
retrieving revision 1.36.2.24
diff -u -p -r1.36.2.24 configure.ac
--- configure.ac        24 Jul 2006 20:02:16 -0000      1.36.2.24
+++ configure.ac        25 Aug 2006 14:06:58 -0000
@@ -18,7 +18,7 @@
 # 02110-1301  USA
 
 AC_PREREQ([2.60])
-AC_INIT([GNU M4], [1.4.5a], address@hidden)
+AC_INIT([GNU M4], [1.4.6], address@hidden)
 AM_INIT_AUTOMAKE([1.9.6 dist-bzip2 gnu])
 PACKAGE=$PACKAGE_TARNAME; AC_SUBST([PACKAGE])
 VERSION=$PACKAGE_VERSION; AC_SUBST([VERSION])