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=90befd186ea00c4f347ce96c028359b9bbd714fb The branch, branch-1-10 has been updated via 90befd186ea00c4f347ce96c028359b9bbd714fb (commit) from d3e929b8e88925df43fa887f9b275acd58eaf60e (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 90befd186ea00c4f347ce96c028359b9bbd714fb Author: Ralf Wildenhues <[EMAIL PROTECTED]> 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/{output-order.test => man3.test} | 40 ++++++++++++------------------- 5 files changed, 29 insertions(+), 27 deletions(-) copy tests/{output-order.test => man3.test} (53%) diff --git a/ChangeLog b/ChangeLog index 7af82a8..8cb05e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2008-01-22 Ralf Wildenhues <[EMAIL PROTECTED]> + * 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-22 Ralf Wildenhues <[EMAIL PROTECTED]> + * configure.ac, NEWS: Bump version to 1.10.1a. 2008-01-21 Ralf Wildenhues <[EMAIL PROTECTED]> diff --git a/lib/am/mans.am b/lib/am/mans.am index 29b8fea..2b5bac9 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 @@ -44,8 +44,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 f7fd00c..bb89110 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -361,6 +361,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 7e2b640..2ae1852 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -493,6 +493,7 @@ makej.test \ makevars.test \ man.test \ man2.test \ +man3.test \ mclean.test \ mdate.test \ mdate2.test \ diff --git a/tests/output-order.test b/tests/man3.test similarity index 53% copy from tests/output-order.test copy to tests/man3.test index 620095d..2527e9c 100755 --- a/tests/output-order.test +++ b/tests/man3.test @@ -3,7 +3,7 @@ # # 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 -# the Free Software Foundation; either version 2, or (at your option) +# the Free Software Foundation; either version 3, or (at your option) # any later version. # # This program is distributed in the hope that it will be useful, @@ -14,39 +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/>. -# Test that `automake -a' output order is stable. -# From report by Bruno Haible. +# PR 516: Prefer generated manpages to distributed ones. . ./defs || exit 1 set -e +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 -: >Makefile.am -: >AUTHORS -: >ChangeLog -: >NEWS -: >README - -cat >.autom4te.cfg <<'END' -begin-language: "Autoconf" -args: --no-cache -end-language: "Autoconf" -begin-language: "Autoconf-without-aclocal-m4" -args: --no-cache -end-language: "Autoconf-without-aclocal-m4" +cat > foo.1.in <<'END' [EMAIL PROTECTED]@ END $ACLOCAL +$AUTOMAKE $AUTOCONF -rm -f missing install-sh -$AUTOMAKE --add-missing --copy 2>stderr -cat stderr >&2 - -for i in 1 2 3 4 5 6; do - rm -f missing install-sh INSTALL COPYING - $AUTOMAKE --add-missing --copy 2>&1 >/dev/null | diff - stderr -done +./configure +$MAKE distcheck DISTCHECK_CONFIGURE_FLAGS=foo=bar hooks/post-receive -- GNU Automake
