Index: tests/defs
===================================================================
RCS file: /cvs/automake/automake/tests/defs,v
retrieving revision 1.33
diff -u -p -u -r1.33 defs
--- defs	2001/06/15 01:02:11	1.33
+++ defs	2001/08/07 22:40:51
@@ -55,6 +55,13 @@ test -z "$PERL" && PERL=perl
 # User can set MAKE to choose which make to use.  Must use GNU make.
 test -z "$MAKE" && MAKE=make
 
+# Unset some MAKE... variables that may cause $MAKE to act like a
+# recursively invoked sub-make.  Any $MAKE invocation in a test is
+# conceptually an independent invocation, not part of the main
+# 'automake' build.
+unset MAKEFLAGS
+unset MAKELEVEL
+
 if ($MAKE --version) > /dev/null 2>&1; then
    needs_gnu_make=:
 else
Index: tests/cond16.test
===================================================================
RCS file: /cvs/automake/automake/tests/cond16.test,v
retrieving revision 1.1
diff -u -p -u -r1.1 cond16.test
--- cond16.test	2001/08/04 04:02:42	1.1
+++ cond16.test	2001/08/07 22:40:51
@@ -34,7 +34,6 @@ END
 
 $needs_autoconf
 (gcc -v) > /dev/null 2>&1 || exit 77
-$needs_gnu_make
 
 set -e
 
@@ -44,6 +43,6 @@ $AUTOMAKE -a
 
 CC='gcc' ./configure
 
-val=`$MAKE --no-print-directory echorule`;
+val=`$MAKE -s echorule`;
 echo $val
 test "x$val" = "xfoo.c foo.o"
Index: tests/substref.test
===================================================================
RCS file: /cvs/automake/automake/tests/substref.test,v
retrieving revision 1.3
diff -u -p -u -r1.3 substref.test
--- substref.test	2001/08/04 03:47:50	1.3
+++ substref.test	2001/08/07 22:40:51
@@ -32,7 +32,6 @@ END
 
 $needs_autoconf
 (gcc -v) > /dev/null 2>&1 || exit 77
-$needs_gnu_make
 
 set -e
 
@@ -42,7 +41,6 @@ $AUTOMAKE -a
 
 CC='gcc' ./configure
 
-# Grep away the entering/leaving directory messages.
-val=`$MAKE --no-print-directory echorule`;
+val=`$MAKE -s echorule`;
 echo $val
 test "x$val" = "xdlmain.c dlmain.o"