[Automake-commit] [SCM] GNU Automake branch, branch-1-10, updated. v1.10.2-27-g5b855ae

[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=5b855aee5c392a6d4f503ce81368487aa85381f6

The branch, branch-1-10 has been updated
       via  5b855aee5c392a6d4f503ce81368487aa85381f6 (commit)
       via  04be5a09cc37a4eef60748e386504470de006f15 (commit)
      from  c84f27c107924ebeec91e283e0389b701227b2e2 (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 5b855aee5c392a6d4f503ce81368487aa85381f6
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Mar 1 16:51:34 2009 +0100

    Fix recursive html and install-* doc rules for BSD make.
    
    * automake.in (%required_targets): Add html-am,
    install-html-am, install-dvi-am, install-pdf-am, install-ps-am,
    install-info-am.
    * tests/txinfo32.test: New test.
    * tests/Makefile.am: Update.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 04be5a09cc37a4eef60748e386504470de006f15
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Mar 1 17:23:29 2009 +0100

    Backport Exit function from master, for easier cherry-picking.
    
    * tests/defs.in (Exit): New function, backported from master,
    to allow easier backporting of tests from master.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog                          |   11 +++++++++++
 Makefile.in                        |   12 ++++++++++++
 automake.in                        |    6 ++++++
 lib/Automake/Makefile.in           |   12 ++++++++++++
 lib/Automake/tests/Makefile.in     |   12 ++++++++++++
 lib/Makefile.in                    |   12 ++++++++++++
 lib/am/Makefile.in                 |   12 ++++++++++++
 m4/Makefile.in                     |   12 ++++++++++++
 tests/Makefile.am                  |    1 +
 tests/Makefile.in                  |   13 +++++++++++++
 tests/defs.in                      |   11 ++++++++++-
 tests/{man3.test => txinfo32.test} |   34 ++++++++++++++++------------------
 12 files changed, 129 insertions(+), 19 deletions(-)
 copy tests/{man3.test => txinfo32.test} (58%)

diff --git a/ChangeLog b/ChangeLog
index 75acf32..fe0ed4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2009-03-01  Ralf Wildenhues  <address@hidden>
 
+       Fix recursive html and install-* doc rules for BSD make.
+       * automake.in (%required_targets): Add html-am,
+       install-html-am, install-dvi-am, install-pdf-am, install-ps-am,
+       install-info-am.
+       * tests/txinfo32.test: New test.
+       * tests/Makefile.am: Update.
+
+       Backport Exit function from master, for easier cherry-picking.
+       * tests/defs.in (Exit): New function, backported from master,
+       to allow easier backporting of tests from master.
+
        Fix comment typo.
        * lib/am/distdir.am (distcheck): Fix typo in comment.
 
diff --git a/Makefile.in b/Makefile.in
index f235dc2..e10a2f0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -593,6 +593,8 @@ dvi-am:
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -601,20 +603,30 @@ install-data-am:
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am: install-binSCRIPTS
        @$(NORMAL_INSTALL)
        $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
diff --git a/automake.in b/automake.in
index c0e1f7b..b0b743d 100755
--- a/automake.in
+++ b/automake.in
@@ -437,12 +437,18 @@ my %required_targets =
    # FIXME: Not required, temporary hacks.
    # Well, actually they are sort of required: the -recursive
    # targets will run them anyway...
+   'html-am'         => 1,
    'dvi-am'          => 1,
    'pdf-am'          => 1,
    'ps-am'           => 1,
    'info-am'         => 1,
    'install-data-am' => 1,
    'install-exec-am' => 1,
+   'install-html-am' => 1,
+   'install-dvi-am'  => 1,
+   'install-pdf-am'  => 1,
+   'install-ps-am'   => 1,
+   'install-info-am' => 1,
    'installcheck-am' => 1,
    'uninstall-am' => 1,
 
diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index 93751fc..5084228 100644
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -482,6 +482,8 @@ dvi-am:
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -490,18 +492,28 @@ install-data-am: install-dist_perllibDATA 
install-nodist_perllibDATA
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index 14f3cdb..dcc08f4 100644
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -336,6 +336,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -344,18 +346,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 32c7aa8..bfc798a 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -457,6 +457,8 @@ dvi-am:
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -467,18 +469,28 @@ install-data-am: install-dist_pkgvdataDATA 
install-dist_scriptDATA
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am: installcheck-local
 
 maintainer-clean: maintainer-clean-recursive
diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in
index 65e4379..4810659 100644
--- a/lib/am/Makefile.in
+++ b/lib/am/Makefile.in
@@ -314,6 +314,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -322,18 +324,28 @@ install-data-am: install-dist_amDATA
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
diff --git a/m4/Makefile.in b/m4/Makefile.in
index c5511dc..8a76de2 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -310,6 +310,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -318,18 +320,28 @@ install-data-am: install-dist_m4dataDATA
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 175ea89..6d8bd2b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -598,6 +598,7 @@ txinfo28.test \
 txinfo29.test \
 txinfo30.test \
 txinfo31.test \
+txinfo32.test \
 transform.test \
 unused.test \
 upc.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 06ce70d..305d465 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -732,6 +732,7 @@ txinfo28.test \
 txinfo29.test \
 txinfo30.test \
 txinfo31.test \
+txinfo32.test \
 transform.test \
 unused.test \
 upc.test \
@@ -971,6 +972,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -979,18 +982,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
diff --git a/tests/defs.in b/tests/defs.in
index a1ddd2a..85e95e5 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -2,7 +2,7 @@
 # @configure_input@
 #
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -241,6 +241,15 @@ case "$srcdir" in
     ;;
 esac
 
+# Automake 1.10a uses a trap for cleanup and an exit wrapper function.
+# We add this here, too, in order to facilitate backporting tests.
+Exit ()
+{
+  set +e
+  (exit $1)
+  exit $1
+}
+
 chmod -R a+rwx testSubDir > /dev/null 2>&1
 rm -rf testSubDir > /dev/null 2>&1
 mkdir testSubDir
diff --git a/tests/man3.test b/tests/txinfo32.test
similarity index 58%
copy from tests/man3.test
copy to tests/txinfo32.test
index fe9394d..267c0e9 100755
--- a/tests/man3.test
+++ b/tests/txinfo32.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2008  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,31 +14,29 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# PR 516: Prefer generated manpages to distributed ones.
+# Make sure the documentation targets work as required with BSD make,
+# even in the presence of subdirs (requires presence of default *-am rules).
 
-. ./defs || exit 1
+. ./defs || Exit 1
 
 set -e
 
-cat > Makefile.am << 'END'
-dist_man_MANS = foo.1
-installcheck-local:
-       grep bar "$(mandir)/man1/foo.1"
-END
-
+mkdir sub
 cat >>configure.in <<'END'
-: ${foo=foo}
-AC_SUBST([foo])
-AC_CONFIG_FILES([foo.1])
+AC_CONFIG_FILES([sub/Makefile])
 AC_OUTPUT
 END
-
-cat > foo.1.in <<'END'
address@hidden@
+cat >Makefile.am <<'END'
+SUBDIRS = sub
 END
+: >sub/Makefile.am
 
 $ACLOCAL
-$AUTOMAKE
 $AUTOCONF
-./configure
-DISTCHECK_CONFIGURE_FLAGS=foo=bar $MAKE -e distcheck
+$AUTOMAKE
+./configure "--prefix=`pwd`/inst"
+$MAKE html dvi ps pdf info \
+      install-html install-dvi install-ps install-pdf install-info \
+      install-man install-data install-exec install uninstall
+
+Exit 0


hooks/post-receive
--
GNU Automake