[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.12.5-190-g18143e7

[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=18143e7cfe66eaddffa481211ad4e340a11a22f4

The branch, master has been updated
       via  18143e7cfe66eaddffa481211ad4e340a11a22f4 (commit)
       via  2f584fa4f117c5d745b0b7b4f57686f2f83424b0 (commit)
       via  d85a97bd08ddbb224124ae3a6cc27930b8db55ec (commit)
       via  2383b2c99b4f12e09beea42ca2d8758c4b24c3a9 (commit)
       via  228258cc8779575e9539ab0936b9e64be6318cf5 (commit)
      from  1efb88cadad61a031d1c297310bc2634562f2e87 (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 -----------------------------------------------------------------
commit 18143e7cfe66eaddffa481211ad4e340a11a22f4
Merge: 1efb88c 2f584fa
Author: Stefano Lattarini <address@hidden>
Date:   Sat Nov 17 20:30:11 2012 +0100

    Merge branch 'maint'
    
    * maint:
      build: fix rebuild rules for Makefile.in and aclocal.m4
      hacking: release procedure: fix order of some steps
      maint: post-release minor version bump
      release: stable release 1.12.5
    
    Signed-off-by: Stefano Lattarini <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 HACKING      |   12 ++++++------
 NEWS         |   13 ++++++++++++-
 configure.ac |   16 ++++++----------
 3 files changed, 24 insertions(+), 17 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 4ad5ce3..4860b30 100644
--- a/NEWS
+++ b/NEWS
@@ -150,7 +150,7 @@ New in 1.13:
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-New in 1.12.5:
+New in 1.12.6:
 
 * WARNING: Future backward-incompatibilities!
 
@@ -213,6 +213,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 00ccc1f..de218da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,16 +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.
-# Use '-I' with aclocal so that our own *.m4 files in m4/ gets included,
-# not copied, in aclocal.m4.
-ACLOCAL="\
-  perllibdir=\"`pwd`/lib$PATH_SEPARATOR./lib\" \"`pwd`/aclocal\" \
-  --automake-acdir=m4 --system-acdir=m4/acdir -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


hooks/post-receive
-- 
GNU Automake