[SCM] GNU Automake branch, master, updated. Release-1-10-113-g56c41c9

[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=56c41c99aff6be60ea2440066cedf852ce15c69a

The branch, master has been updated
       via  56c41c99aff6be60ea2440066cedf852ce15c69a (commit)
      from  379e37ea35bf38164c23d44dbef344a11274085b (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 56c41c99aff6be60ea2440066cedf852ce15c69a
Author: Ralf Wildenhues <address@hidden>
Date:   Tue Jan 22 23:35:57 2008 +0100

    Prefer generated manpages over distributed ones.
    
    * lib/am/mans.am (install-man%SECTION%): Prefer generated manpages
    over distributed ones.
    Report and patch by Peter Breitenlohner.
    * tests/man3.test: New test.
    * tests/Makefile.am: Update.

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

Summary of changes:
 ChangeLog                         |    8 ++++++++
 lib/am/mans.am                    |    6 +++---
 tests/Makefile.am                 |    1 +
 tests/Makefile.in                 |    1 +
 tests/{amsubst.test => man3.test} |   29 ++++++++++++++++-------------
 5 files changed, 29 insertions(+), 16 deletions(-)
 copy tests/{amsubst.test => man3.test} (68%)

diff --git a/ChangeLog b/ChangeLog
index 7ccca02..7b1f150 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-01-22  Ralf Wildenhues  <address@hidden>
+
+       * lib/am/mans.am (install-man%SECTION%): Prefer generated manpages
+       over distributed ones.
+       Report and patch by Peter Breitenlohner.
+       * tests/man3.test: New test.
+       * tests/Makefile.am: Update.
+
 2008-01-21  Ralf Wildenhues  <address@hidden>
 
        * tests/tar.test: Skip if no appropriate tar was found.
diff --git a/lib/am/mans.am b/lib/am/mans.am
index b3e9053..4281254 100644
--- a/lib/am/mans.am
+++ b/lib/am/mans.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1998, 2001, 2003, 2004, 2006 Free Software Foundation, Inc.
+## Copyright (C) 1998, 2001, 2003, 2004, 2006, 2008 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
@@ -42,8 +42,8 @@ install-man%SECTION%: $(man%SECTION%_MANS) $(man_MANS)
        done; \
        for i in $$list; do \
 ## Find the file.
-         if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-         else file=$$i; fi; \
+         if test -f $$i; then file=$$i; \
+         else file=$(srcdir)/$$i; fi; \
 ## Change the extension if needed.
          ext=`echo $$i | sed -e 's/^.*\\.//'`; \
          case "$$ext" in \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index db40acc..796a34d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -371,6 +371,7 @@ makej.test \
 makevars.test \
 man.test \
 man2.test \
+man3.test \
 mclean.test \
 mdate.test \
 mdate2.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index ceff3f4..219d4dd 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -520,6 +520,7 @@ makej.test \
 makevars.test \
 man.test \
 man2.test \
+man3.test \
 mclean.test \
 mdate.test \
 mdate2.test \
diff --git a/tests/amsubst.test b/tests/man3.test
similarity index 68%
copy from tests/amsubst.test
copy to tests/man3.test
index e98e706..2527e9c 100755
--- a/tests/amsubst.test
+++ b/tests/man3.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2006  Free Software Foundation, Inc.
+# Copyright (C) 2008  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,28 +14,31 @@
 # 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 for _AM_SUBST_NOTMAKE.
+# PR 516: Prefer generated manpages to distributed ones.
 
 . ./defs || exit 1
 
 set -e
 
-cat >> configure.in << 'END'
-AC_SUBST([backslash], "\\")
-_AM_SUBST_NOTMAKE([backslash])
+cat > Makefile.am << 'END'
+dist_man_MANS = foo.1
+installcheck-local:
+       grep bar "$(mandir)/man1/foo.1"
+END
+
+cat >>configure.in <<'END'
+: ${foo=foo}
+AC_SUBST([foo])
+AC_CONFIG_FILES([foo.1])
 AC_OUTPUT
 END
 
-cat > Makefile.am << 'END'
-test:
-       @echo $(backslash) @address@hidden
+cat > foo.1.in <<'END'
address@hidden@
 END
 
 $ACLOCAL
-$AUTOCONF
 $AUTOMAKE
+$AUTOCONF
 ./configure
-
-# If _AM_SUBST_NOTMAKE is not honored, the backslash
-# variable will not be empty.
-$MAKE test | grep '^[$]$'
+$MAKE distcheck DISTCHECK_CONFIGURE_FLAGS=foo=bar


hooks/post-receive
--
GNU Automake