[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11-49-g942c6d5

[Ralf Wildenhues]

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=942c6d5bc4f9cc6da65de4ea4310337929810941

The branch, branch-1.11 has been updated
       via  942c6d5bc4f9cc6da65de4ea4310337929810941 (commit)
       via  f26e642bb2b4801d72a76d232ab4b330208b6c74 (commit)
       via  375912c466b28a6121d351b9ff5513133a1c7227 (commit)
       via  f5d5e459eb030d6c7c199919555ca167839b3bfa (commit)
       via  e58e5b453ad7b3cbda6c6f0968a63c001203c082 (commit)
      from  aafcb2907e3c4690c6f06df9da5cfce755117cfd (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 942c6d5bc4f9cc6da65de4ea4310337929810941
Merge: aafcb2907e3c4690c6f06df9da5cfce755117cfd 
f26e642bb2b4801d72a76d232ab4b330208b6c74
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Nov 29 22:29:33 2009 +0100

    Merge branch 'maint' into branch-1.11

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

Summary of changes:
 ChangeLog                            |   31 ++++++++++++++++++++++
 Makefile.am                          |    1 +
 Makefile.in                          |    5 ++-
 lib/Automake/Makefile.in             |    4 +-
 lib/Automake/Wrap.pm                 |    2 +-
 lib/Makefile.in                      |    4 +-
 lib/am/subdirs.am                    |    4 +-
 lib/gnupload                         |   48 +++++++++++++++-------------------
 tests/Makefile.am                    |    1 +
 tests/Makefile.in                    |    1 +
 tests/{exdir3.test => subdir10.test} |   22 ++++++++-------
 11 files changed, 77 insertions(+), 46 deletions(-)
 copy tests/{exdir3.test => subdir10.test} (73%)

diff --git a/ChangeLog b/ChangeLog
index 31e6159..8be4c1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+2009-11-29  Karl Berry  <address@hidden>
+
+       Rewrite `gnupload --help' examples.
+       * lib/gnupload: Use GNU style version numbers, a generic package
+       name, and more useful examples.
+
+2009-11-28  Jim Meyering  <address@hidden>
+
+       avoid a warning from perl-5.11
+       * lib/Automake/Wrap.pm (_tab_length): Remove useless use of tr's
+       "/d" modifier.
+
+2009-11-14  Ralf Wildenhues  <address@hidden>
+
+       Distribute the Automake bootstrap script.
+       * Makefile.am (EXTRA_DIST): Add bootstrap.
+       Report by Jan Engelhardt.
+
+2009-10-31  Jim Meyering  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       Don't let an envvar setting of "$fail" cause build failure.
+       Without this change, in a project using an automake-generated
+       Makefile, "make fail=anything" would fail inappropriately,
+       due to the `test -z "$$fail"' at the end of this emitted rule:
+       * lib/am/subdirs.am ($(RECURSIVE_TARGETS)): Initialize "fail=" to keep
+       an envvar setting of that variable from causing unwarranted failure.
+       ($(RECURSIVE_CLEAN_TARGETS)): Likewise.
+       * tests/subdir10.test: New test.
+       * tests/Makefile.am: Update.
+
 2009-10-17  Ralf Wildenhues  <address@hidden>
 
        Sync auxiliary files from upstream.
diff --git a/Makefile.am b/Makefile.am
index d082a3a..b4d608a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,6 +39,7 @@ EXTRA_DIST = \
   ChangeLog.02 \
   ChangeLog.03 \
   ChangeLog.04 \
+  bootstrap \
   $(AUTOMAKESOURCES)
 
 ## Make versioned links.  We only run the transform on the root name;
diff --git a/Makefile.in b/Makefile.in
index 32d8629..18e1f5d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -232,6 +232,7 @@ EXTRA_DIST = \
   ChangeLog.02 \
   ChangeLog.03 \
   ChangeLog.04 \
+  bootstrap \
   $(AUTOMAKESOURCES)
 
 do_subst = sed \
@@ -377,7 +378,7 @@ uninstall-binSCRIPTS:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-       @failcom='exit 1'; \
+       @fail= failcom='exit 1'; \
        for f in x $$MAKEFLAGS; do \
          case $$f in \
            *=* | --[!k]*);; \
@@ -402,7 +403,7 @@ $(RECURSIVE_TARGETS):
        fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-       @failcom='exit 1'; \
+       @fail= failcom='exit 1'; \
        for f in x $$MAKEFLAGS; do \
          case $$f in \
            *=* | --[!k]*);; \
diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index dcd4c8b..7cb9760 100644
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -327,7 +327,7 @@ uninstall-nodist_perllibDATA:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-       @failcom='exit 1'; \
+       @fail= failcom='exit 1'; \
        for f in x $$MAKEFLAGS; do \
          case $$f in \
            *=* | --[!k]*);; \
@@ -352,7 +352,7 @@ $(RECURSIVE_TARGETS):
        fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-       @failcom='exit 1'; \
+       @fail= failcom='exit 1'; \
        for f in x $$MAKEFLAGS; do \
          case $$f in \
            *=* | --[!k]*);; \
diff --git a/lib/Automake/Wrap.pm b/lib/Automake/Wrap.pm
index 09a135a..66213d1 100644
--- a/lib/Automake/Wrap.pm
+++ b/lib/Automake/Wrap.pm
@@ -55,7 +55,7 @@ sub tab_length($)
 {
   my ($txt) = @_;
   my $len = length ($txt);
-  $len += 7 * ($txt =~ tr/\t/\t/d);
+  $len += 7 * ($txt =~ tr/\t/\t/);
   return $len;
 }
 
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 5d853bc..0b1226d 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -300,7 +300,7 @@ uninstall-dist_scriptDATA:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-       @failcom='exit 1'; \
+       @fail= failcom='exit 1'; \
        for f in x $$MAKEFLAGS; do \
          case $$f in \
            *=* | --[!k]*);; \
@@ -325,7 +325,7 @@ $(RECURSIVE_TARGETS):
        fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-       @failcom='exit 1'; \
+       @fail= failcom='exit 1'; \
        for f in x $$MAKEFLAGS; do \
          case $$f in \
            *=* | --[!k]*);; \
diff --git a/lib/am/subdirs.am b/lib/am/subdirs.am
index b86e674..9c01a8c 100644
--- a/lib/am/subdirs.am
+++ b/lib/am/subdirs.am
@@ -36,7 +36,7 @@ AM_RECURSIVE_TARGETS += $(RECURSIVE_TARGETS:-recursive=) \
 $(RECURSIVE_TARGETS):
 ## Using $failcom allows "-k" to keep its natural meaning when running a
 ## recursive rule.
-       @failcom='exit 1'; \
+       @fail= failcom='exit 1'; \
        for f in x $$MAKEFLAGS; do \
          case $$f in \
            *=* | --[!k]*);; \
@@ -75,7 +75,7 @@ maintainer-clean: maintainer-clean-recursive
 $(RECURSIVE_CLEAN_TARGETS):
 ## Using $failcom allows "-k" to keep its natural meaning when running a
 ## recursive rule.
-       @failcom='exit 1'; \
+       @fail= failcom='exit 1'; \
        for f in x $$MAKEFLAGS; do \
          case $$f in \
            *=* | --[!k]*);; \
diff --git a/lib/gnupload b/lib/gnupload
index 8320b58..104f8ad 100755
--- a/lib/gnupload
+++ b/lib/gnupload
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Sign files and upload them.
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2009-11-29.20; # UTC
 
 # Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation
 #
@@ -73,34 +73,28 @@ actual command line options.  Use this to keep your 
defaults.  Comments
 (#) and empty lines in $conffile are allowed.
 
 Examples:
-1. Upload automake-1.8.2b.tar.gz and automake-1.8.2b.tar.bz2 to two sites:
-  gnupload --to sources.redhat.com:~ftp/pub/automake \\
-           --to alpha.gnu.org:automake \\
-           automake-1.8.2b.tar.gz automake-1.8.2b.tar.bz2
-
-2. Same as above, but also create symbolic links to automake-latest.tar.*:
-  gnupload --to sources.redhat.com:~ftp/pub/automake \\
-           --to alpha.gnu.org:automake \\
-           --symlink-regex \\
-           automake-1.8.2b.tar.gz automake-1.8.2b.tar.bz2
-
-3. Symlink automake-1.8.2b.tar.gz to automake-latest.tar.gz and
-automake-1.8.2b.tar.bz2 to automake-latest.tar.bz2 on both sites:
+1. Upload foobar-1.0.tar.gz to ftp.gnu.org:
+  gnupload --to ftp.gnu.org:foobar foobar-1.0.tar.gz
 
-  gnupload --to sources.redhat.com:~ftp/pub/automake \\
-           --to alpha.gnu.org:automake \\
-           --symlink automake-1.8.2b.tar.gz automake-latest.tar.gz \\
-                     automake-1.8.2b.tar.bz2 automake-latest.tar.bz2
+2. Upload foobar-1.0.tar.gz and foobar-1.0.tar.xz to ftp.gnu.org:
+  gnupload --to ftp.gnu.org:foobar foobar-1.0.tar.gz foobar-1.0.tar.xz
 
-4. Delete automake-1.8.2a.tar.gz and .bz2, remove symlink
-automake-latest.tar.gz and upload automake-1.8.2b.tar.gz:
-
-  gnupload --to sources.redhat.com:~ftp/pub/automake \\
-           --to alpha.gnu.org:automake \\
-           --delete automake-1.8.2a.tar.gz automake-1.8.2a.tar.bz2 \\
-           --rmsymlink automake-latest.tar.gz \\
-           -- \\
-           automake-1.8.2b.tar.gz automake-1.8.2b.tar.bz2
+3. Same as above, and also create symbolic links to foobar-latest.tar.*:
+  gnupload --to ftp.gnu.org:foobar \\
+           --symlink-regex \\
+           foobar-1.0.tar.gz foobar-1.0.tar.xz
+
+4. Upload foobar-0.9.90.tar.gz to two sites:
+  gnupload --to alpha.gnu.org:foobar \\
+           --to sources.redhat.com:~ftp/pub/foobar \\
+           foobar-0.9.90.tar.gz
+
+5. Delete oopsbar-0.9.91.tar.gz and upload foobar-0.9.91.tar.gz
+   (the -- terminates the list of files to delete):
+  gnupload --to alpha.gnu.org:foobar \\
+           --to sources.redhat.com:~ftp/pub/foobar \\
+           --delete oopsbar-0.9.91.tar.gz \\
+           -- foobar-0.9.91.tar.gz
 
 Report bugs to <address@hidden>.
 Send patches to <address@hidden>."
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 98829c9..2c2e89a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -617,6 +617,7 @@ subdir6.test \
 subdir7.test \
 subdir8.test \
 subdir9.test \
+subdir10.test \
 subdirbuiltsources.test \
 subcond.test \
 subcond2.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 3667aca..9c9ac74 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -851,6 +851,7 @@ subdir6.test \
 subdir7.test \
 subdir8.test \
 subdir9.test \
+subdir10.test \
 subdirbuiltsources.test \
 subcond.test \
 subcond2.test \
diff --git a/tests/exdir3.test b/tests/subdir10.test
similarity index 73%
copy from tests/exdir3.test
copy to tests/subdir10.test
index d51bdf9..c71216b 100755
--- a/tests/exdir3.test
+++ b/tests/subdir10.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2007  Free Software Foundation, Inc.
+# Copyright (C) 2009  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,24 +14,26 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Test to make sure pkgdatadir can be overridden via AC_SUBST.
+# SUDBIRS with $fail set in the environment.
 
 . ./defs || Exit 1
 
 set -e
 
-cat >>configure.in <<'EOF'
-AC_SUBST([pkgdatadir], ["FOO"])
+mkdir sub
+
+cat >> configure.in <<'END'
+AC_CONFIG_FILES([sub/Makefile])
 AC_OUTPUT
-EOF
+END
 
-cat > Makefile.am << 'EOF'
-showme:
-       @echo $(pkgdatadir)
-EOF
+echo SUBDIRS = sub >Makefile.am
+: > sub/Makefile.am
 
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE
 ./configure
-$MAKE showme | grep FOO
+env fail=1 $MAKE all clean
+
+Exit 0


hooks/post-receive
-- 
GNU Automake