[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.12.5-3-g2f584fa

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=2f584fa4f117c5d745b0b7b4f57686f2f83424b0

The branch, maint has been updated
       via  2f584fa4f117c5d745b0b7b4f57686f2f83424b0 (commit)
       via  d85a97bd08ddbb224124ae3a6cc27930b8db55ec (commit)
       via  2383b2c99b4f12e09beea42ca2d8758c4b24c3a9 (commit)
      from  228258cc8779575e9539ab0936b9e64be6318cf5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 HACKING         |   12 ++++++------
 NEWS            |   13 ++++++++++++-
 configure.ac    |   12 +++++++-----
 m4/amversion.m4 |    4 ++--
 4 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/HACKING b/HACKING
index e245039..d69c75d 100644
--- a/HACKING
+++ b/HACKING
@@ -258,12 +258,6 @@
   locations.  In case you need to sign with a non-default key, you can
   use "make GNUPLOADFLAGS='--user KEY' git-upload-release".
 
-* Update version number in configure.ac to next alpha number.
-  Re-run ./bootstrap.sh and commit.
-
-* Don't forget to "git push" your changes so they appear in the public
-  git tree.
-
 * For stable releases, update the manuals at www.gnu.org:
   - Generate manuals:
     cd doc
@@ -275,6 +269,12 @@
   - Check for link errors, fix them, recheck until convergence:
     <http://validator.w3.org/checklink>
 
+* Update version number in configure.ac to next alpha number.
+  Re-run ./bootstrap.sh and commit.
+
+* Don't forget to "git push" your changes so they appear in the public
+  git tree.
+
 * Send the announcement at least to <address@hidden> and
   <address@hidden>.  If the release is a stable one, the announcement
   must also go to <address@hidden>; if it is an alpha or beta release,
diff --git a/NEWS b/NEWS
index 438ec68..e1fcd27 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-New in 1.12.5:
+New in 1.12.6:
 
 * WARNING: Future backward-incompatibilities!
 
@@ -61,6 +61,17 @@ New in 1.12.5:
     giving more useful warnings than a bare "command not found" from a
     make recipe would.
 
+Bugs fixed in 1.12.6:
+
+* Bugs introduced in 1.12.5:
+
+  - The maintainer rebuild rules for Makefiles and aclocal.m4 in Automake's
+    own build system works correctly again.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+New in 1.12.5:
+
 * Vala support:
 
   - The AM_PROG_VALAC macro has been enhanced to takes two further
diff --git a/configure.ac b/configure.ac
index 2e2e485..7f126c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ([2.69])
-AC_INIT([GNU Automake], [1.12.5], address@hidden)
+AC_INIT([GNU Automake], [1.12.5a], address@hidden)
 
 AC_CONFIG_SRCDIR([automake.in])
 AC_CONFIG_AUX_DIR([lib])
@@ -63,10 +63,12 @@ AC_SUBST([amdir], ["\${pkgvdatadir}/am"])
 AC_SUBST([automake_acdir], ["\${datadir}/aclocal-$APIVERSION"])
 AC_SUBST([system_acdir], ["\${datadir}/aclocal"])
 
-# $AUTOMAKE and $ACLOCAL are always run after a "cd $top_srcdir",
-# hence '.' is really what we want for perllibdir, libdir, and acdir.
-ACLOCAL="perllibdir=\"`pwd`/lib$PATH_SEPARATOR./lib\" \"`pwd`/aclocal\" 
--acdir=m4 -I m4"
-AUTOMAKE="perllibdir=\"`pwd`/lib$PATH_SEPARATOR./lib\" \"`pwd`/automake\" 
--libdir=lib"
+# Our build system is bootstrapped with the bleeding-edge versions of
+# aclocal and automake, hence the remake rules must use those versions
+# as well.  The extra quoting is to cater to cases when the build
+# directory contains whitespace or shell metacharacters.
+ACLOCAL="\"`pwd`/t/wrap/aclocal-$APIVERSION\""
+AUTOMAKE="\"`pwd`/t/wrap/automake-$APIVERSION\""
 
 AC_PATH_PROG([PERL], [perl])
 if test -z "$PERL"; then
diff --git a/m4/amversion.m4 b/m4/amversion.m4
index b354bdc..d9c4224 100644
--- a/m4/amversion.m4
+++ b/m4/amversion.m4
@@ -15,7 +15,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.12'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.12.5], [],
+m4_if([$1], [1.12.5a], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -31,7 +31,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.5])dnl
+[AM_AUTOMAKE_VERSION([1.12.5a])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])


hooks/post-receive
-- 
GNU Automake