[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.12b

[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=9ebccd05291f99c446908e6485f338f4ea47ecf5

The branch, master has been updated
       via  9ebccd05291f99c446908e6485f338f4ea47ecf5 (commit)
       via  3b503c42e33b53ae82e160f002289b39152347cb (commit)
       via  6179686fe621bfbf542614dfe5eb7a4e6c973393 (commit)
      from  fb214402c043a70581f19d4856a81362a5a1a0d6 (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 9ebccd05291f99c446908e6485f338f4ea47ecf5
Author: Stefano Lattarini <address@hidden>
Date:   Wed Dec 19 11:18:53 2012 +0100

    release: beta release 1.12b (will become 1.13)
    
    * configure.ac (AC_INIT): Bump version number to 1.12b.
    * m4/amversion.m4: Likewise (auto-updated by "make bootstrap").
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 3b503c42e33b53ae82e160f002289b39152347cb
Author: Stefano Lattarini <address@hidden>
Date:   Wed Dec 19 10:42:56 2012 +0100

    cosmetics: comments fixlets in our Makefile
    
    * Makefile.am: Prefer '#' comments over '##' ones where it makes sense.
    Other minor style tweaks to comments about "updated later" variables.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 6179686fe621bfbf542614dfe5eb7a4e6c973393
Author: Stefano Lattarini <address@hidden>
Date:   Wed Dec 19 10:40:13 2012 +0100

    cosmetics: consistency changes in some make recipes
    
    * Makefile.am (install-exec-hook, uninstall-hook): Don't use extra
    quoting in variable assignments.  More consistent use of whitespace.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 Makefile.am     |   38 ++++++++++++++++++++------------------
 configure.ac    |    2 +-
 m4/amversion.m4 |    6 +++---
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 5686528..6a4ebd4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,13 +73,13 @@ EXTRA_DIST += \
   syntax-checks.mk \
   HACKING
 
-## Make versioned links.  We only run the transform on the root name;
-## then we make a versioned link with the transformed base name.  This
-## seemed like the most reasonable approach.
+# Make versioned links.  We only run the transform on the root name;
+# then we make a versioned link with the transformed base name.  This
+# seemed like the most reasonable approach.
 install-exec-hook:
        @$(POST_INSTALL)
        @for p in $(bin_SCRIPTS); do \
-         f="`echo $$p|sed '$(transform)'`"; \
+         f=`echo $$p | sed '$(transform)'`; \
          fv="$$f-$(APIVERSION)"; \
          rm -f "$(DESTDIR)$(bindir)/$$fv"; \
          echo " $(LN) '$(DESTDIR)$(bindir)/$$f' '$(DESTDIR)$(bindir)/$$fv'"; \
@@ -88,13 +88,13 @@ install-exec-hook:
 
 uninstall-hook:
        @for p in $(bin_SCRIPTS); do \
-         f="`echo $$p|sed '$(transform)'`"; \
+         f=`echo $$p | sed '$(transform)'`; \
          fv="$$f-$(APIVERSION)"; \
          rm -f "$(DESTDIR)$(bindir)/$$fv"; \
        done
 
-## These files depend on Makefile so they are rebuilt if $(VERSION),
-## $(datadir) or other do_subst'ituted variables change.
+# These files depend on Makefile so they are rebuilt if $(VERSION),
+# $(datadir) or other do_subst'ituted variables change.
 automake: automake.in
 aclocal: aclocal.in
 automake aclocal: Makefile
@@ -105,9 +105,9 @@ automake aclocal: Makefile
 ## comments, and that is perfectly legit.
        $(AM_V_at)chmod a+x,a-w address@hidden && mv -f address@hidden $@
 
-## The master location for INSTALL is lib/INSTALL.
-## This is where "make fetch" will install new versions.
-## Make sure we also update this copy.
+# The master location for INSTALL is lib/INSTALL.
+# This is where "make fetch" will install new versions.
+# Make sure we also update this copy.
 INSTALL: lib/INSTALL
        $(AM_V_GEN)cp $(srcdir)/lib/INSTALL $@
 
@@ -131,9 +131,9 @@ dist_pkgvdata_DATA = \
   lib/INSTALL \
   lib/texinfo.tex
 
-## These must all be executable when installed.  However, if we use
-## _SCRIPTS, then the program transform will be applied, which is not
-## what we want.  So we make them executable by hand.
+# These must all be executable when installed.  However, if we use
+# _SCRIPTS, then the program transform will be applied, which is not
+# what we want.  So we make them executable by hand.
 dist_script_DATA = \
   lib/config.guess \
   lib/config.sub \
@@ -334,7 +334,8 @@ AM_TAP_LOG_DRIVER_FLAGS = --merge
 
 EXTRA_DIST += t/README t/ax/is t/ax/is_newest
 
-TESTS = ## Will be updated later.
+## Will be updated later.
+TESTS =
 
 # Some testsuite-influential variables should be overridable from the
 # test scripts, but not from the environment.
@@ -390,9 +391,9 @@ $(srcdir)/t/testsuite-part.am:
        $(AM_V_at)mv -f t/testsuite-part.tmp $@
 EXTRA_DIST += gen-testsuite-part
 
-## The dependecies declared here are not truly complete, but such
-## completeness would cause more issues than it would solve.  See
-## automake bug#11347.
+# The dependecies declared here are not truly complete, but such
+# completeness would cause more issues than it would solve.  See
+# automake bug#11347.
 $(generated_TESTS): $(srcdir)/gen-testsuite-part
 $(srcdir)/t/testsuite-part.am: $(srcdir)/gen-testsuite-part Makefile.am
 
@@ -432,7 +433,8 @@ EXTRA_DIST += t/ax/test-defs.in
 CLEANFILES += t/ax/test-defs.sh
 nodist_noinst_DATA = t/ax/test-defs.sh
 
-noinst_SCRIPTS = # Will be updated soon.
+## Will be updated soon.
+noinst_SCRIPTS =
 
 t/ax/shell-no-trail-bslash: t/ax/shell-no-trail-bslash.in Makefile
        $(AM_V_at)rm -f $@ address@hidden
diff --git a/configure.ac b/configure.ac
index 033fa26..9925ab7 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.12a], address@hidden)
+AC_INIT([GNU Automake], [1.12b], address@hidden)
 
 AC_CONFIG_SRCDIR([automake.in])
 AC_CONFIG_AUX_DIR([lib])
diff --git a/m4/amversion.m4 b/m4/amversion.m4
index 368cd64..211fce7 100644
--- a/m4/amversion.m4
+++ b/m4/amversion.m4
@@ -12,10 +12,10 @@
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.12a'
+[am__api_version='1.12b'
 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.12a], [],
+m4_if([$1], [1.12b], [],
       [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.12a])dnl
+[AM_AUTOMAKE_VERSION([1.12b])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