[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-1074-gb8d6454

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

The branch, master has been updated
       via  b8d6454c2c96ff4d4a9878d382618d72a81a1146 (commit)
       via  7a770586e81edba77ebdbd83fb6ca6fed39d2fab (commit)
       via  8c021e00169da8802d47e9428e282aa6ff78b656 (commit)
       via  94ad7e48dc63321ca334e71c0f87dc3eada8ffd6 (commit)
       via  02ab80cebbb9efc1e3dfbd3034dc517f3c5e099d (commit)
       via  ae412c3817a7fe6d553863c0b2a825bd400e4b76 (commit)
      from  579b15b79bb494f51e44baaaffc18c8c1e636e63 (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 b8d6454c2c96ff4d4a9878d382618d72a81a1146
Merge: 579b15b 7a77058
Author: Stefano Lattarini <address@hidden>
Date:   Thu Oct 20 14:50:47 2011 +0200

    Merge branch 'maint'
    
    * maint:
      tests: avoid spurious failure of 'uninstall-fail.test' on Cygwin
      tests: fix spurious failure with autoconf 2.62
      docs: avoid using colon character inside arguments of @pxref

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

Summary of changes:
 ChangeLog                          |   27 +++++++++++++++++++++++++++
 THANKS                             |    2 +-
 doc/automake.texi                  |    2 +-
 tests/aclocal-path-precedence.test |    4 ++--
 tests/uninstall-fail.test          |    8 +++++---
 5 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bb0a521..c762410 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2011-10-19  Stefano Lattarini  <address@hidden>
+
+       tests: avoid spurious failure of 'uninstall-fail.test' on Cygwin
+       * tests/uninstall-fail.test: Be sure to really skip this test
+       on systems that allows files to be removed from unwritable
+       directories.  Motivated by a spurious failure on Cygwin 1.5.
+
+2011-10-17  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failure with autoconf 2.62
+       * tests/aclocal-path-precedence.test: Rewrite configure.in,
+       rather than appending to it, to avoid spurious failures (at
+       least with autoconf 2.62) due to repeated calls to AC_INIT.
+       Also, add package name and version arguments to AC_INIT, to
+       avoid spurious errors from automake.
+
+2011-10-16  Stefano Lattarini  <address@hidden>
+
+       docs: avoid using colon character inside arguments of @pxref
+       Fixes automake bug#9753
+       * doc/automake.texi (VPATH Builds): Avoid using colon character
+       `:' inside arguments of @pxref, as this can cause problems in
+       the generated `.info' files, and such an usage will be explicitly
+       forbidden by future texinfo documentation.
+       * THANKS: Update.
+       Reported by Дилян Палаузов.
+
 2011-10-17  Stefano Lattarini  <address@hidden>
 
        refactor: improve signature of 'check_directory' sub in automake
diff --git a/THANKS b/THANKS
index c78ad21..373451e 100644
--- a/THANKS
+++ b/THANKS
@@ -84,7 +84,7 @@ Diab Jerius           address@hidden
 Didier Cassirame       address@hidden
 Dieter Baron           address@hidden
 Dieter Jurzitza                address@hidden
-Dilyan Palauzov                address@hidden
+Дилян Палаузов          address@hidden
 Dmitry Mikhin          address@hidden
 Dmitry V. Levin                address@hidden
 Doug Evans             address@hidden
diff --git a/doc/automake.texi b/doc/automake.texi
index 21f4cfb..2a4b7c9 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -898,7 +898,7 @@ about some concurrency in the way build commands are run.  
For this
 reason we refer to such setups using the name @emph{VPATH builds} in
 the following.  @emph{VPATH} is the name of the @command{make} feature
 used by the @file{Makefile}s to allow these builds (@pxref{General
-Search, , @code{VPATH}: Search Path for All Prerequisites, make, The
+Search, , @code{VPATH} Search Path for All Prerequisites, make, The
 GNU Make Manual}).
 
 @cindex multiple configurations, example
diff --git a/tests/aclocal-path-precedence.test 
b/tests/aclocal-path-precedence.test
index b170dd5..c02fd3b 100755
--- a/tests/aclocal-path-precedence.test
+++ b/tests/aclocal-path-precedence.test
@@ -21,8 +21,8 @@ am_create_testdir=empty
 
 set -e
 
-cat >> configure.in << 'END'
-AC_INIT
+cat > configure.in << END
+AC_INIT([$me], [1.0])
 AM_INIT_AUTOMAKE([parallel-tests])
 FOO_MACRO
 BAR_MACRO
diff --git a/tests/uninstall-fail.test b/tests/uninstall-fail.test
index a3e7a7a..a57b665 100755
--- a/tests/uninstall-fail.test
+++ b/tests/uninstall-fail.test
@@ -24,6 +24,11 @@
 
 set -e
 
+mkdir d
+: > d/f
+chmod a-w d || skip "cannot make directories unwritable"
+rm -f d/f && skip_ "can delete files from unwritable directories"
+
 cat >> configure.in << 'END'
 AC_OUTPUT
 END
@@ -46,9 +51,6 @@ mkdir $inst $inst/share
 : > $inst/share/foobar.txt
 
 chmod a-w $inst/share
-touch $inst/share/t && skip_ "cannot make directories unwritable"
-rm -f $inst/share/t
-
 $MAKE uninstall >output 2>&1 && { cat output; Exit 1; }
 cat output
 grep "rm: .*foobar\.txt" output


hooks/post-receive
-- 
GNU Automake