Merge branch 'maint'

diff --cc ChangeLog
index afeac95,1c883ac..c4a7167
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,13 +1,13 @@@
  2011-04-12  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
+       coverage: test for automake bug#8485 (known regression)
+       * tests/yacc-dist-nobuild-subdir.test: New test.
+       * tests/Makefile.am (TESTS, XFAIL_TESTS): Update.
+ 
+ 2011-04-12  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
        test defs: define default $distdir (help reducing duplication)
 -      * tests/defs.in ($distdir): New variable, might be used in
 +      * tests/defs ($distdir): New variable, might be used in
        testcases checking distribution-related features.
        * tests/pr9.test: Use it.
        * tests/subdir9.test: Likewise.

diff --cc tests/Makefile.am
index 852dbe9,b91a025..3bfab8a
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -24,11 -21,10 +24,12 @@@ all.test 
  auxdir2.test \
  cond17.test \
  gcj6.test \
 +override-conditional-2.test \
  pr8365-remake-timing.test \
+ yacc-dist-nobuild-subdir.test \
  txinfo5.test
  
 +
  include $(srcdir)/parallel-tests.am
  
  $(srcdir)/parallel-tests.am: gen-parallel-tests Makefile.am
@@@ -1013,26 -830,17 +1014,27 @@@ yacc6.test 
  yacc7.test \
  yacc8.test \
  yaccdry.test \
 +yacc-dist-nobuild.test \
 +yacc-nodist.test \
  yaccpp.test \
  yaccvpath.test \
 +yacc-d-vpath.test \
+ yacc-dist-nobuild-subdir.test \
  yflags.test \
  yflags2.test \
 +yflags-cmdline-override.test \
 +yflags-conditional.test \
 +yflags-d-false-positives.test \
 +yflags-force-override.test \
 +yflags-force-conditional.test \
 +yflags-var-expand.test \
  $(parallel_tests)
  
 -EXTRA_DIST = ChangeLog-old gen-parallel-tests $(TESTS)
 +EXTRA_DIST += $(TESTS)
 +
  
  # Each test case depends on defs, aclocal, and automake.
 -check_SCRIPTS = defs aclocal-$(APIVERSION) automake-$(APIVERSION)
 +$(TEST_LOGS): defs aclocal-$(APIVERSION) automake-$(APIVERSION)
  
  clean-local: clean-local-check
  .PHONY: clean-local-check

diff --cc tests/Makefile.in
index 715054d,0cc6854..1e81e0b
--- 1/tests/Makefile.in
--- 2/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -281,84 -272,44 +281,85 @@@ target_alias = @target_alias
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 -XFAIL_TESTS = \
 -all.test \
 -auxdir2.test \
 -cond17.test \
 -gcj6.test \
 -pr8365-remake-timing.test \
 -yacc-dist-nobuild-subdir.test \
 -txinfo5.test
 -
 -parallel_tests = \
 -check-exported-srcdir-p.test \
 -check-tests-in-builddir-p.test \
 -check-tests_environment-p.test \
 -check-p.test \
 -check10-p.test \
 -check11-p.test \
 -check2-p.test \
 -check3-p.test \
 -check4-p.test \
 -check5-p.test \
 -check6-p.test \
 -check7-p.test \
 -check8-p.test \
 -check9-p.test \
 -color-p.test \
 -color2-p.test \
 -comment9-p.test \
 -dejagnu-p.test \
 -exeext4-p.test \
 -maken3-p.test \
 -maken4-p.test \
 -pr401-p.test \
 -pr401b-p.test \
 -pr401c-p.test
 -
 -MAINTAINERCLEANFILES = $(parallel_tests)
 +MAINTAINERCLEANFILES = $(parallel_tests) $(instspc_tests)
 +EXTRA_DIST = ChangeLog-old gen-parallel-tests instspc-tests.sh \
 +      $(TESTS)
 +XFAIL_TESTS = all.test auxdir2.test cond17.test gcj6.test \
 +      override-conditional-2.test pr8365-remake-timing.test \
-       txinfo5.test $(instspc_xfail_tests)
++      yacc-dist-nobuild-subdir.test txinfo5.test \
++      $(instspc_xfail_tests)
 +parallel_tests = backcompat5-p.test check-exported-srcdir-p.test \
 +      check-tests-in-builddir-p.test check-tests_environment-p.test \
 +      check-p.test check10-p.test check11-p.test check12-p.test \
 +      check2-p.test check3-p.test check4-p.test check5-p.test \
 +      check6-p.test check7-p.test check8-p.test check9-p.test \
 +      color-p.test color2-p.test comment9-p.test dejagnu-p.test \
 +      exeext4-p.test maken3-p.test maken4-p.test \
 +      posixsubst-tests-p.test pr401-p.test pr401b-p.test \
 +      pr401c-p.test
 +instspc_tests = instspc-squote-build.test instspc-squote-install.test \
 +      instspc-dquote-build.test instspc-dquote-install.test \
 +      instspc-bquote-build.test instspc-bquote-install.test \
 +      instspc-sharp-build.test instspc-sharp-install.test \
 +      instspc-dollar-build.test instspc-dollar-install.test \
 +      instspc-bang-build.test instspc-bang-install.test \
 +      instspc-bslash-build.test instspc-bslash-install.test \
 +      instspc-ampersand-build.test instspc-ampersand-install.test \
 +      instspc-percent-build.test instspc-percent-install.test \
 +      instspc-leftpar-build.test instspc-leftpar-install.test \
 +      instspc-rightpar-build.test instspc-rightpar-install.test \
 +      instspc-pipe-build.test instspc-pipe-install.test \
 +      instspc-caret-build.test instspc-caret-install.test \
 +      instspc-tilde-build.test instspc-tilde-install.test \
 +      instspc-qmark-build.test instspc-qmark-install.test \
 +      instspc-star-build.test instspc-star-install.test \
 +      instspc-plus-build.test instspc-plus-install.test \
 +      instspc-minus-build.test instspc-minus-install.test \
 +      instspc-comma-build.test instspc-comma-install.test \
 +      instspc-colon-build.test instspc-colon-install.test \
 +      instspc-semicol-build.test instspc-semicol-install.test \
 +      instspc-equal-build.test instspc-equal-install.test \
 +      instspc-less-build.test instspc-less-install.test \
 +      instspc-more-build.test instspc-more-install.test \
 +      instspc-at-build.test instspc-at-install.test \
 +      instspc-lqbrack-build.test instspc-lqbrack-install.test \
 +      instspc-rqbrack-build.test instspc-rqbrack-install.test \
 +      instspc-lcbrack-build.test instspc-lcbrack-install.test \
 +      instspc-rcbrack-build.test instspc-rcbrack-install.test \
 +      instspc-space-build.test instspc-space-install.test \
 +      instspc-tab-build.test instspc-tab-install.test \
 +      instspc-linefeed-build.test instspc-linefeed-install.test \
 +      instspc-backspace-build.test instspc-backspace-install.test \
 +      instspc-formfeed-build.test instspc-formfeed-install.test \
 +      instspc-carriageret-build.test \
 +      instspc-carriageret-install.test \
 +      instspc-quadrigraph0-build.test \
 +      instspc-quadrigraph0-install.test \
 +      instspc-quadrigraph1-build.test \
 +      instspc-quadrigraph1-install.test \
 +      instspc-quadrigraph2-build.test \
 +      instspc-quadrigraph2-install.test \
 +      instspc-quadrigraph3-build.test \
 +      instspc-quadrigraph3-install.test \
 +      instspc-quadrigraph4-build.test \
 +      instspc-quadrigraph4-install.test instspc-a_b-build.test \
 +      instspc-a_b-install.test instspc-a__b-build.test \
 +      instspc-a__b-install.test instspc-a_lf_b-build.test \
 +      instspc-a_lf_b-install.test instspc-dotdotdot-build.test \
 +      instspc-dotdotdot-install.test instspc-dosdrive-build.test \
 +      instspc-dosdrive-install.test instspc-miscglob1-build.test \
 +      instspc-miscglob1-install.test instspc-miscglob2-build.test \
 +      instspc-miscglob2-install.test
 +instspc_xfail_tests = instspc-squote-build.test \
 +      instspc-dquote-build.test instspc-bquote-build.test \
 +      instspc-sharp-build.test instspc-dollar-build.test \
 +      instspc-bslash-build.test instspc-ampersand-build.test \
 +      instspc-linefeed-build.test instspc-quadrigraph0-build.test \
 +      instspc-a_lf_b-build.test instspc-squote-install.test \
 +      instspc-dquote-install.test instspc-bquote-install.test \
 +      instspc-sharp-install.test instspc-dollar-install.test \
 +      instspc-linefeed-install.test instspc-a_lf_b-install.test
  TESTS = \
 -aclibobj.test \
  aclocal.test \
  aclocal3.test \
  aclocal4.test \
@@@ -1274,21 -1100,17 +1275,22 @@@ yacc6.test 
  yacc7.test \
  yacc8.test \
  yaccdry.test \
 +yacc-dist-nobuild.test \
 +yacc-nodist.test \
  yaccpp.test \
  yaccvpath.test \
 +yacc-d-vpath.test \
+ yacc-dist-nobuild-subdir.test \
  yflags.test \
  yflags2.test \
 +yflags-cmdline-override.test \
 +yflags-conditional.test \
 +yflags-d-false-positives.test \
 +yflags-force-override.test \
 +yflags-force-conditional.test \
 +yflags-var-expand.test \
  $(parallel_tests)
  
 -EXTRA_DIST = ChangeLog-old gen-parallel-tests $(TESTS)
 -
 -# Each test case depends on defs, aclocal, and automake.
 -check_SCRIPTS = defs aclocal-$(APIVERSION) automake-$(APIVERSION)
  all: all-am
  
  .SUFFIXES: