* tests/man2.test: New file.

* tests/Makefile.am (TESTS): Add man2.test.
* lib/am/mans.am (install-man%SECTION%): Change the extension
of the man pages being installed, as documented.

diff --git a/ChangeLog b/ChangeLog
index 1ca8e2ec3128176256dd1f4954a4d01b3cb5b3f7..8a4738dbbdc1f9e96d06f4096149acc63de90ce0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-04-13  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * tests/man2.test: New file.
+       * tests/Makefile.am (TESTS): Add man2.test.
+       * lib/am/mans.am (install-man%SECTION%): Change the extension
+       of the man pages being installed, as documented.
+
 2002-04-13  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
        Enable traces; wipe out the old configure.in parser.

diff --git a/lib/am/mans.am b/lib/am/mans.am
index 21838e97dfd36e195befd6479870105ea11a1ce0..b6fa21aa57b7a6228bbdb5945920502c1abdbdc7 100644 (file)
--- a/lib/am/mans.am
+++ b/lib/am/mans.am
@@ -46,9 +46,14 @@ install-man%SECTION%: $(man%SECTION%_MANS) $(man_MANS)
 ## Find the file.
          if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
          else file=$$i; fi; \
+## Change the extension if needed.
+         ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+         case "$$ext" in \
+           %SECTION%*) ;; \
+           *) ext='%SECTION%' ;; \
+         esac; \
 ## Extract basename of man page and run it through the program rename
 ## transform.
-         ext=`echo $$i | sed -e 's/^.*\\.//'`; \
          inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
          inst=`echo $$inst | sed -e 's/^.*\///'`; \
          inst=`echo $$inst | sed '$(transform)'`.$$ext; \

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 24a528e07a08aaa370ab04a549f3f4c27ccd90ce..cec29a447bc2d8be23a3b446cecb8085fc49f997 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -212,6 +212,7 @@ ltlibobjs.test \
 make.test \
 makevars.test \
 man.test \
+man2.test \
 mclean.test \
 mdate.test \
 mdate2.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index d0696cf21f1ba9da7bbf87019c582bc33aaa524a..717ac2a9ab14dd1306686b31f5eded8dd3dc835a 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -296,6 +296,7 @@ ltlibobjs.test \
 make.test \
 makevars.test \
 man.test \
+man2.test \
 mclean.test \
 mdate.test \
 mdate2.test \

diff --git a/tests/man2.test b/tests/man2.test
new file mode 100755 (executable)
index 0000000..28ddb86
--- /dev/null
+++ b/tests/man2.test
@@ -0,0 +1,31 @@
+#! /bin/sh
+
+# Make sure that man pages listed in man_MANS are installed and
+# renamed as documented.
+
+. $srcdir/defs || exit 1
+
+set -e
+
+echo AC_OUTPUT >> configure.in
+
+cat > Makefile.am << 'END'
+man_MANS = foo.2
+man4_MANS = foo.4 bar.man
+END
+
+: > foo.2
+: > foo.4
+: > bar.man
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+# Let's play with $DESTDIR too, it shouldn't hurt.
+./configure --prefix=''
+$MAKE DESTDIR=$PWD/=inst install
+
+test -f ./=inst/man/man2/foo.2
+test -f ./=inst/man/man4/foo.4
+test -f ./=inst/man/man4/bar.4