[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.12.2-108-gc4d20d8

[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=c4d20d83584c3a293354210dd5ebe7e6351d8979

The branch, maint has been updated
       via  c4d20d83584c3a293354210dd5ebe7e6351d8979 (commit)
       via  e49762d8dc79c3f9a46c16766e0a28fd229bc039 (commit)
       via  af1ac94a49e1131c2c3a4e1e008b4245ece61b3a (commit)
       via  346d76aa2338c0108d872fc7eedbd18c9db30102 (commit)
       via  fd189a05ca269424fd4eae7d79a788aec5438658 (commit)
      from  daeca29aa2500bcbba1fd7bfe285a6e6d0500ef3 (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 c4d20d83584c3a293354210dd5ebe7e6351d8979
Author: Stefano Lattarini <address@hidden>
Date:   Tue Aug 14 13:09:41 2012 +0200

    maint: post-release minor version bump
    
    * configure.ac (AC_INIT): Bump version number to 1.12.3a.
    * m4/amversion.m4: Likewise (automatically regenerated by
    "make bootstrap").
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit e49762d8dc79c3f9a46c16766e0a28fd229bc039
Author: Stefano Lattarini <address@hidden>
Date:   Mon Aug 13 18:43:37 2012 +0200

    release: stable release 1.12.3
    
    * configure.ac (AC_INIT): Bump version number to 1.12.3.
    * m4/amversion.m4: Likewise (auto-updated by "./bootstrap").
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit af1ac94a49e1131c2c3a4e1e008b4245ece61b3a
Author: Stefano Lattarini <address@hidden>
Date:   Mon Aug 13 18:00:57 2012 +0200

    maintcheck: fix spurious warnings
    
    * t/distcheck-override-infodir.sh: Be sure that valid occurences
    of the "aclocal" and "automake" strings, which can confuse the
    'sc_tests_plain_automake' check, are protected by leading "#"
    characters.
    * t/ax/test-lib.sh: Always use '$(...)' for command subtitution,
    to avoid triggering the 'sc_tests_command_subst' check; there was
    still once place where `...` was used.  While at it, fix a related
    comment.
    * t/ax/test-defs.in ($sleep): Use creative quoting to avoid
    spuriously triggering the 'sc_tests_plain_sleep' check.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 346d76aa2338c0108d872fc7eedbd18c9db30102
Author: Stefano Lattarini <address@hidden>
Date:   Mon Aug 13 15:03:43 2012 +0200

    docs: fix typo: s/make install-info/make uninstall-info/
    
    * doc/automake.texi (Texinfo): Here.  And a minor wording improvement
    while we are at it.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit fd189a05ca269424fd4eae7d79a788aec5438658
Author: Stefano Lattarini <address@hidden>
Date:   Mon Aug 13 14:38:02 2012 +0200

    tests: fixup: make a couple of tests executable
    
    * t/python-am-path-iftrue.sh: This.
    * t/python-missing.sh: And this.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 configure.ac                    |    2 +-
 doc/automake.texi               |    6 ++--
 m4/amversion.m4                 |    4 +-
 t/ax/test-defs.in               |    4 ++-
 t/ax/test-lib.sh                |    8 ++++--
 t/distcheck-override-infodir.sh |   47 ++++++++++++++++++++-------------------
 6 files changed, 38 insertions(+), 33 deletions(-)
 mode change 100644 => 100755 t/python-am-path-iftrue.sh
 mode change 100644 => 100755 t/python-missing.sh

diff --git a/configure.ac b/configure.ac
index d54cae0..3664124 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.2a], address@hidden)
+AC_INIT([GNU Automake], [1.12.3a], address@hidden)
 
 AC_CONFIG_SRCDIR([automake.in])
 AC_CONFIG_AUX_DIR([lib])
diff --git a/doc/automake.texi b/doc/automake.texi
index a168bb9..ac2c0a5 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -7967,9 +7967,9 @@ be prevented via the @code{no-installinfo} option.  In 
this case,
 request this explicitly using @samp{make install-info}.
 
 @vindex AM_UPDATE_INFO_DIR
-By default, @code{make install-info} and @code{make install-info}
-will try to run the @command{install-info} program (if available)
-to update (or create) the @address@hidden@address@hidden/dir} index.
+By default, @code{make install-info} and @code{make uninstall-info}
+will try to run the @command{install-info} program (if available) to
+update (or create/remove) the @address@hidden@address@hidden/dir} index.
 If this is undesired, it can be prevented by exporting the
 @code{AM_UPDATE_INFO_DIR} variable to "@code{no}".
 
diff --git a/m4/amversion.m4 b/m4/amversion.m4
index 4dbc326..06ae69a 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.2a], [],
+m4_if([$1], [1.12.3a], [],
       [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.2a])dnl
+[AM_AUTOMAKE_VERSION([1.12.3a])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/t/ax/test-defs.in b/t/ax/test-defs.in
index 56b45e1..dbfe827 100644
--- a/t/ax/test-defs.in
+++ b/t/ax/test-defs.in
@@ -165,7 +165,9 @@ TEX=${AM_TESTSUITE_TEX-'@TEX@'}
 # The amount we should wait after modifying files depends on the platform.
 # For instance, Windows '95, '98 and ME have 2-second granularity
 # and can be up to 3 seconds in the future w.r.t. the system clock.
-sleep='sleep @MODIFICATION_DELAY@'
+# The creative quoting is to avoid spuriously triggering a failure in
+# the maintainer checks,
+sleep='sleep ''@MODIFICATION_DELAY@'
 
 # An old timestamp that can be given to a file, in "touch -t" format.
 # The time stamp should be portable to all file systems of interest.
diff --git a/t/ax/test-lib.sh b/t/ax/test-lib.sh
index 6048f81..71c2e49 100644
--- a/t/ax/test-lib.sh
+++ b/t/ax/test-lib.sh
@@ -51,9 +51,11 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 
2>&1; then
   }
 else
   argv0=$0
-  # Avoid command substitution failure, for it might cause problems with
-  # "set -e" on some shells.
-  case `(set -o) 2>/dev/null || :` in *posix*) set -o posix;; esac
+  # Ignore command substitution failure, for it might cause problems
+  # with "set -e" on some shells.
+  am_shell_opts=$(set -o) || :
+  case $am_shell_opts in *posix*) set -o posix;; esac
+  unset am_shell_opts
 fi
 
 # A single whitespace character.
diff --git a/t/distcheck-override-infodir.sh b/t/distcheck-override-infodir.sh
index ff792f7..74f6c67 100755
--- a/t/distcheck-override-infodir.sh
+++ b/t/distcheck-override-infodir.sh
@@ -38,29 +38,30 @@ installcheck-local:
        fi
 END
 
-cat > main.texi << 'END'
-\input texinfo
address@hidden main.info
address@hidden main
-
address@hidden Explicit calls to @dircategory and @direntry required to ensure 
that
address@hidden a 'dir' file will be created also by older versions of 
'install-info'
address@hidden (e.g., the one coming with Texinfo 4.8).
-
address@hidden Software development
address@hidden
-* Automake: (automake).  Making GNU standards-compliant Makefiles
address@hidden direntry
-
address@hidden Individual utilities
address@hidden
-* aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4
-* automake-invocation: (automake)automake Invocation. Generating Makefile.in
address@hidden direntry
-
address@hidden Top
-Hello walls.
address@hidden
+# Protect with leading " # " to avoid spurious maintainer-check failures.
+sed 's/^ #//' > main.texi << 'END'
+ # \input texinfo
+ # @setfilename main.info
+ # @settitle main
+ #
+ # @c Explicit calls to @dircategory and @direntry required to ensure that
+ # @c a 'dir' file will be created also by older versions of 'install-info'
+ # @c (e.g., the one coming with Texinfo 4.8).
+ #
+ # @dircategory Software development
+ # @direntry
+ # * Automake: (automake).  Making GNU standards-compliant Makefiles
+ # @end direntry
+ #
+ # @dircategory Individual utilities
+ # @direntry
+ # * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4
+ # * automake-invocation: (automake)automake Invocation. Generating Makefile.in
+ # @end direntry
+ #
+ # @node Top
+ # Hello walls.
+ # @bye
 END
 
 $ACLOCAL
diff --git a/t/python-am-path-iftrue.sh b/t/python-am-path-iftrue.sh
old mode 100644
new mode 100755
diff --git a/t/python-missing.sh b/t/python-missing.sh
old mode 100644
new mode 100755


hooks/post-receive
-- 
GNU Automake