[Automake-commit] [SCM] GNU Automake branch, master, updated. Release-1-10-161-gf9cee42

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

The branch, master has been updated
       via  f9cee424996297f6936af2f0ba6002ecfb2821d6 (commit)
      from  bdae563c149e64c2c0893350920585d77419129d (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 f9cee424996297f6936af2f0ba6002ecfb2821d6
Author: Ralf Wildenhues <address@hidden>
Date:   Tue Aug 19 23:20:32 2008 +0200

    * tests/notrans.test: Use multiple man files of each type.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog          |    2 +
 tests/notrans.test |   56 ++++++++++++++++++++++++++++++++++-----------------
 2 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4b1191d..cc540cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2008-08-19  Ralf Wildenhues  <address@hidden>
 
+       * tests/notrans.test: Use multiple man files of each type.
+
        Fix maintainer-check failures.
        * doc/automake.texi (Conditionals): Drop TAB.
        * tests/missing6.test: Use 'rm -f'.
diff --git a/tests/notrans.test b/tests/notrans.test
index 6d73547..bf7ad7f 100755
--- a/tests/notrans.test
+++ b/tests/notrans.test
@@ -26,59 +26,77 @@ AC_OUTPUT
 END
 
 cat > Makefile.am << 'EOF'
-man_MANS = foo.1
-dist_man_MANS = bar.2
-nodist_man_MANS = baz.3
-notrans_man_MANS = x-foo.4
-notrans_dist_man_MANS = x-bar.5
-notrans_nodist_man_MANS = x-baz.6
-man7_MANS = y-foo.man
-dist_man5_MANS = y-bar.man
-nodist_man4_MANS = y-baz.man
-notrans_man3_MANS = z-foo.man
-notrans_dist_man2_MANS = z-bar.man
-notrans_nodist_man1_MANS = z-baz.man
+man_MANS = foo.1 foo2.1
+dist_man_MANS = bar.2 bar2.2
+nodist_man_MANS = baz.3 baz2.3
+notrans_man_MANS = x-foo.4 x-foo2.4
+notrans_dist_man_MANS = x-bar.5 x-bar2.5
+notrans_nodist_man_MANS = x-baz.6 x-baz2.6
+man7_MANS = y-foo.man y-foo2.man
+dist_man5_MANS = y-bar.man y-bar2.man
+nodist_man4_MANS = y-baz.man y-baz2.man
+notrans_man3_MANS = z-foo.man z-foo2.man
+notrans_dist_man2_MANS = z-bar.man z-bar2.man
+notrans_nodist_man1_MANS = z-baz.man z-baz2.man
 
 # These two are ignored
 dist_notrans_man_MANS = nosuch.8
 nodist_notrans_man9_MANS = nosuch.man
 
-y-foo.man:
+y-foo.man y-foo2.man:
        : >$@
-y-bar.man:
+y-bar.man y-bar2.man:
        : >$@
-y-baz.man:
+y-baz.man y-baz2.man:
        : >$@
-z-foo.man:
+z-foo.man z-foo2.man:
        : >$@
-z-bar.man:
+z-bar.man z-bar2.man:
        : >$@
-z-baz.man:
+z-baz.man z-baz2.man:
        : >$@
 
 test-install: install
        test -f inst/man/man1/gnu-foo.1
+       test -f inst/man/man1/gnu-foo2.1
        test -f inst/man/man2/gnu-bar.2
+       test -f inst/man/man2/gnu-bar2.2
        test -f inst/man/man3/gnu-baz.3
+       test -f inst/man/man3/gnu-baz2.3
        test -f inst/man/man4/x-foo.4
+       test -f inst/man/man4/x-foo2.4
        test -f inst/man/man5/x-bar.5
+       test -f inst/man/man5/x-bar2.5
        test -f inst/man/man6/x-baz.6
+       test -f inst/man/man6/x-baz2.6
        test -f inst/man/man7/gnu-y-foo.7
+       test -f inst/man/man7/gnu-y-foo2.7
        test -f inst/man/man5/gnu-y-bar.5
+       test -f inst/man/man5/gnu-y-bar2.5
        test -f inst/man/man4/gnu-y-baz.4
+       test -f inst/man/man4/gnu-y-baz2.4
        test -f inst/man/man3/z-foo.3
+       test -f inst/man/man3/z-foo2.3
        test -f inst/man/man2/z-bar.2
+       test -f inst/man/man2/z-bar2.2
        test -f inst/man/man1/z-baz.1
+       test -f inst/man/man1/z-baz2.1
        if test -d inst/man/man8; then (exit 1); else :; fi
        if test -d inst/man/man9; then (exit 1); else :; fi
 EOF
 
 : > foo.1
+: > foo2.1
 : > bar.2
+: > bar2.2
 : > baz.3
+: > baz2.3
 : > x-foo.4
+: > x-foo2.4
 : > x-bar.5
+: > x-bar2.5
 : > x-baz.6
+: > x-baz2.6
 
 $ACLOCAL
 $AUTOCONF
@@ -97,7 +115,7 @@ if grep '^install-man9:' Makefile.in; then exit 1; else :; fi
 ./configure --program-prefix=gnu- --prefix "`pwd`"/inst --mandir 
"`pwd`"/inst/man
 $MAKE
 $MAKE test-install
-test `find inst/man -type f -print | wc -l` = 12
+test `find inst/man -type f -print | wc -l` = 24
 $MAKE uninstall
 test `find inst/man -type f -print | wc -l` = 0
 


hooks/post-receive
--
GNU Automake