Merge branch 'tests-man-fixes'

diff --git a/ChangeLog b/ChangeLog
index c80c2ee..3e76016 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-12-21  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
+       man8.test: avoid comments inside recipe commands.
+       * tests/man8.test: Remove shell comments from makefile rule
+       commands, as they are not portable to (at least) Tru64 make.
+
+2010-12-21  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
        Fix sed-related buglet in test "subdir5.test"
        * tests/subdir5.test: Always terminate text passed to the
        `i' sed command with a newline, to work around limitations

diff --git a/tests/man8.test b/tests/man8.test
index 2ef52b4..377eeff 100755 (executable)
--- a/tests/man8.test
+++ b/tests/man8.test
@@ -23,7 +23,8 @@ set -e
 cat > Makefile.am << 'END'
 dist_man_MANS = foo.1
 foo.1:
-       rm -f $(srcdir)/$@  # fails if $(srcdir) is unwritable
+## this 'rm' command will fail if $(srcdir) is unwritable
+       rm -f $(srcdir)/$@
        : > $(srcdir)/$@
 END