two small check-related fixes in Automake

[Ralf Wildenhues]

I've committed these two patches to maint, to fix 'make clean check',
as well as 'cd tests; make recheck' after a test failure that involves
an inner test using parallel-tests.

Cheers,
Ralf

    Fix `make clean check' for the Automake package.
    
    * lib/Automake/Makefile.am (SUBDIRS): Add `.' before `tests',
    so that Config.pm is built first.

diff --git a/lib/Automake/Makefile.am b/lib/Automake/Makefile.am
index a75e2d5..51ffde0 100644
--- a/lib/Automake/Makefile.am
+++ b/lib/Automake/Makefile.am
@@ -16,7 +16,8 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-SUBDIRS = tests
+# `make clean check' should build Config.pm first.
+SUBDIRS = . tests
 
 perllibdir = $(pkgvdatadir)/Automake
 dist_perllib_DATA = \


    Fix in-tree `recheck' after failed test that runs `check'.
    
    If a test like pr401b-p.test fails for some reason, a `make
    recheck' would cause another reason for failure because it sets
    AM_MAKEFLAGS which gets propagated into the test and causes its
    `make check' to fail.
    
    * tests/defs.in: Also unset AM_MAKEFLAGS.

diff --git a/tests/defs.in b/tests/defs.in
index 969c9fb..a15ec9c 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -306,9 +306,7 @@ END
 # recursively invoked sub-make.  Any $MAKE invocation in a test is
 # conceptually an independent invocation, not part of the main
 # 'automake' build.
-unset MFLAGS
-unset MAKEFLAGS
-unset MAKELEVEL
+unset MFLAGS MAKEFLAGS MAKELEVEL AM_MAKEFLAGS
 # Unset verbosity flag.
 unset V
 # Also unset variables that will let `make -e install' divert