[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.14.1-169-g4b4d630

[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=4b4d63009aaa057a013cfc5c7e3c7cd0d55f7bfe

The branch, master has been updated
       via  4b4d63009aaa057a013cfc5c7e3c7cd0d55f7bfe (commit)
       via  3f9fc60baa2e7f9324e17a26f592e92148b7117c (commit)
       via  5825771062a8823cd08e8547655f4c5cdf9b94bb (commit)
       via  153745f2bbb5e9c3526a6c2949f835ce7778f7cb (commit)
       via  5b3b1c83b47c1e29629049046b982636938d2b5d (commit)
       via  6465c530f7a6b6a88a839b7afe64e5a76429050c (commit)
       via  74cdef7897da220bf062957ff9699815681441ef (commit)
      from  9042530473b52251a4022cc0a0e02636b9a53211 (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 4b4d63009aaa057a013cfc5c7e3c7cd0d55f7bfe
Merge: 9042530 3f9fc60
Author: Stefano Lattarini <address@hidden>
Date:   Wed Dec 17 18:21:04 2014 +0100

    Merge branch 'minor'
    
    * minor:
      Fix dumb logic error preventing $install_sh from being be overridden
      Automake docs: fix typos and use of British English
      Expose automake bug#19311
      build: fix race in parallel builds
      build: fix race in parallel builds

commit 3f9fc60baa2e7f9324e17a26f592e92148b7117c
Author: Thomas Jahns <address@hidden>
Date:   Thu Aug 7 11:03:06 2014 +0200

    Fix dumb logic error preventing $install_sh from being be overridden
    
    * m4/install-sh.m4: Here.
    * THANKS: Update.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 THANKS                              |    1 +
 doc/automake.texi                   |   12 ++++++------
 lib/am/texi-vers.am                 |   18 +++++++++---------
 m4/install-sh.m4                    |    2 +-
 t/{tar-pax.sh => auxdir-pr19311.sh} |   28 +++++++++++++++-------------
 t/list-of-tests.mk                  |    2 ++
 6 files changed, 34 insertions(+), 29 deletions(-)
 copy t/{tar-pax.sh => auxdir-pr19311.sh} (67%)

diff --git a/THANKS b/THANKS
index eef67c3..6fd7115 100644
--- a/THANKS
+++ b/THANKS
@@ -393,6 +393,7 @@ Theodoros V. Kalamatianos       address@hidden
 Thien-Thi Nguyen                address@hidden
 Thomas Fitzsimmons              address@hidden
 Thomas Gagne                    address@hidden
+Thomas Jahns                    address@hidden
 Thomas Klausner                 address@hidden
 Thomas Morgan                   address@hidden
 Thomas Schwinge                 address@hidden
diff --git a/doc/automake.texi b/doc/automake.texi
index fa22517..e566f7b 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -1831,7 +1831,7 @@ variable definitions.
 @cindex indentation in Makefile.am
 Generally, Automake is not particularly smart in the parsing of unusual
 Makefile constructs, so you're advised to avoid fancy constructs or
-``creative'' use of whitespaces.
+``creative'' use of whitespace.
 @c Keep this in sync with doc-parsing-buglets-tabs.sh
 For example, @key{TAB} characters cannot be used between a target name
 and the following address@hidden:}'' character, and variable assignments
@@ -3276,7 +3276,7 @@ find third-party @file{.m4} files.  When this option is 
given, normal
 processing is suppressed.  This option was used @emph{in the past} by
 third-party packages to determine where to install @file{.m4} macro
 files, but @emph{this usage is today discouraged}, since it causes
address@hidden(prefix)} not to be thoroughly honoured (which violates the
address@hidden(prefix)} not to be thoroughly honored (which violates the
 GNU Coding Standards), and a similar semantics can be better obtained
 with the @env{ACLOCAL_PATH} environment variable; @pxref{Extending aclocal}.
 
@@ -3474,7 +3474,7 @@ Also note that, if the @option{--install} option is used, 
any @file{.m4}
 file containing a required macro that is found in a directory listed in
 @env{ACLOCAL_PATH} will be installed locally.
 @c Keep in sync with aclocal-path-installed-serial.sh
-In this case, serial numbers in @file{.m4} are honoured too,
+In this case, serial numbers in @file{.m4} are honored too,
 @pxref{Serials}.
 
 Conversely to @file{dirlist}, @env{ACLOCAL_PATH} is useful if you are
@@ -7854,7 +7854,7 @@ All of these targets can be extended using @samp{-local} 
rules
 
 If the @file{.texi} file @code{@@include}s @file{version.texi}, then
 that file will be automatically generated.  The file @file{version.texi}
-defines four Texinfo flag you can reference using
+defines four Texinfo flags you can reference using
 @code{@@address@hidden@}}, @code{@@address@hidden@}},
 @code{@@address@hidden@}}, and @code{@@address@hidden@}}.
 
@@ -8456,7 +8456,7 @@ dist-hook:
         rm -rf `find $(distdir)/doc -type d -name .svn`
 @end example
 
address@hidden The caveates described here should be documented in 
'disthook.sh'.
address@hidden The caveats described here should be documented in 'disthook.sh'.
 @noindent
 Note that the @code{dist-hook} recipe shouldn't assume that the regular
 files in the distribution directory are writable; this might not be the
@@ -9447,7 +9447,7 @@ The @file{.trs} file is used to register some metadata 
through the use
 of custom reStructuredText fields.  This metadata is expected to be
 employed in various ways by the parallel test harness; for example, to
 count the test results when printing the testsuite summary, or to decide
-which tests to re-run upon @command{make reheck}.  Unrecognized metadata
+which tests to re-run upon @command{make recheck}.  Unrecognized metadata
 in a @file{.trs} file is currently ignored by the harness, but this might
 change in the future. The list of currently recognized metadata follows.
 
diff --git a/lib/am/texi-vers.am b/lib/am/texi-vers.am
index b3a8d12..ec91dfe 100644
--- a/lib/am/texi-vers.am
+++ b/lib/am/texi-vers.am
@@ -31,25 +31,25 @@ DIST_COMMON += %VTEXI% %STAMPVTI%
 ## %STAMPVTI% is distributed and %DIRSTAMP% isn't: a distributed file
 ## should never be dependent upon a non-distributed built file.
 ## Therefore we ensure that %DIRSTAMP% exists in the rule.
+## Use cp + mv so that the update of %VTEXI% is atomic even if
+## the source directory is on a different file system.
 ?DIRSTAMP?     @test -f %DIRSTAMP% || $(MAKE) $(AM_MAKEFLAGS) %DIRSTAMP%
        @(dir=.; test -f ./%TEXI% || dir=$(srcdir); \
        set `$(SHELL) %MDDIR%mdate-sh $$dir/%TEXI%`; \
        echo "@set UPDATED $$1 $$2 $$3"; \
        echo "@set UPDATED-MONTH $$2 $$3"; \
        echo "@set EDITION $(VERSION)"; \
-       echo "@set VERSION $(VERSION)") > %VTI%.tmp
-## Use cp and rm here because some older "mv"s can't move across
-## filesystems.  Furthermore, GNU "mv" in the AmigaDOS environment
-## can't handle this.
-       @cmp -s %VTI%.tmp %VTEXI% \
-         || (echo "Updating %VTEXI%"; \
-             cp %VTI%.tmp %VTEXI%)
-       address@hidden -f %VTI%.tmp
+       echo "@set VERSION $(VERSION)") > %VTI%.tmp$$$$ && \
+       (cmp -s %VTI%.tmp$$$$ %VTEXI% \
+         || (echo "Updating %VTEXI%" && \
+             cp %VTI%.tmp$$$$ %VTEXI%.tmp$$$$ && \
+             mv %VTEXI%.tmp$$$$ %VTEXI%)) && \
+       rm -f %VTI%.tmp$$$$ %VTEXI%.$$$$
        @cp %VTEXI% $@
 
 mostlyclean-am: mostlyclean-%VTI%
 mostlyclean-%VTI%:
-       -rm -f %VTI%.tmp
+       -rm -f %VTI%.tmp* %VTEXI%.tmp*
 
 maintainer-clean-am: maintainer-clean-%VTI%
 maintainer-clean-%VTI%:
diff --git a/m4/install-sh.m4 b/m4/install-sh.m4
index 094c10a..16a3d9c 100644
--- a/m4/install-sh.m4
+++ b/m4/install-sh.m4
@@ -10,7 +10,7 @@
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
   case $am_aux_dir in
   *\ * | *\    *)
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
diff --git a/t/tar-pax.sh b/t/auxdir-pr19311.sh
similarity index 67%
copy from t/tar-pax.sh
copy to t/auxdir-pr19311.sh
index c1efbb4..56c71a1 100644
--- a/t/tar-pax.sh
+++ b/t/auxdir-pr19311.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2004-2014 Free Software Foundation, Inc.
+# Copyright (C) 2014 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,30 +14,32 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Check the tar-pax option.
+# Automake bug#19311: AC_PROG_CC called before AC_CONFIG_AUX_DIR can
+# silently force wrong $ac_aux_dir definition.
 
+am_create_testdir=empty
+required=cc
 . test-init.sh
 
 cat > configure.ac <<END
 AC_INIT([$me], [1.0])
-AM_INIT_AUTOMAKE([tar-pax])
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
+AC_PROG_CC
+AC_CONFIG_AUX_DIR([build-aux])
+AM_INIT_AUTOMAKE
+AC_OUTPUT([Makefile])
 END
 
 : > Makefile.am
 
+mkdir build-aux
+
 $ACLOCAL
+$AUTOMAKE -a
 $AUTOCONF
-$AUTOMAKE
-./configure
 
-grep 'am__tar' Makefile # For debugging.
-if grep '^am__tar = false' Makefile; then
-  skip_ "cannot find proper archiver program"
-fi
+test -f build-aux/compile
+test -f build-aux/install-sh
 
-$MAKE distcheck
-test -f "$distdir.tar.gz"
+./configure
 
 :
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 75dda05..2616922 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -30,6 +30,7 @@ t/pm/Version3.pl
 
 XFAIL_TESTS = \
 t/all.sh \
+t/auxdir-pr19311.sh \
 t/cond17.sh \
 t/gcj6.sh \
 t/override-conditional-2.sh \
@@ -186,6 +187,7 @@ t/auxdir-autodetect.sh \
 t/auxdir-computed.tap \
 t/auxdir-misplaced.sh \
 t/auxdir-nonexistent.sh \
+t/auxdir-pr19311.sh \
 t/auxdir-unportable.tap \
 t/backcompat.sh \
 t/backcompat2.sh \


hooks/post-receive
-- 
GNU Automake