Merge branch 'maint'

diff --cc ChangeLog
index 0ded3b8,26038e1..c3e6d3a
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,23 -1,19 +1,37 @@@
+ 2010-12-22  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       distlinksbrk.test: Work around botched "make -k".
+       * tests/distlinksbrk.test: Run "make" multiple times and grep
+       its output each time for a single error message, rather than
+       running "make -k" one single time and grepping its output for
+       all the expected error messages.  This should work around make
+       implementations with limited (broken?) `-k' support; for more
+       information, see these subthreads on the automake-patches list:
+         - 2010-11-15, "Testsuite failures on HP-UX 11.23",
+           <http://lists.gnu.org/archive/html/automake-patches/2010-11/msg00162.html>
+         - 2010-11-15, "Testsuite failures on IRIX 6.5",
+           <http://lists.gnu.org/archive/html/automake-patches/2010-11/msg00166.html>
+ 
  2010-12-21  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
 +      Minor improvements to test 'amopts.test'.
 +      * tests/amopts.test: Remove botched comment.  Make grepping of
 +      automake stderr slighty stricter.  Add trailing `:' command.
 +
 +2010-12-21  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      backcompat6.test: avoid comments inside recipe commands.
 +      * tests/backcompat6.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>
 +
 +      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