FYI: use $MAKE and $AUTOCONF in the testsuite

[Alexandre Duret-Lutz]

I'm checking this in.  This also adds checks to maintainer-check
to detect direct calls to make/aclocal/autoconf/automake/perl.

Index: ChangeLog
===================================================================
RCS file: /cvs/automake/automake/ChangeLog,v
retrieving revision 1.1788
diff -u -r1.1788 ChangeLog
--- ChangeLog   2002/03/20 22:27:09     1.1788
+++ ChangeLog   2002/03/21 09:05:30
@@ -1,3 +1,14 @@
+2002-03-21  Alexandre Duret-Lutz  <address@hidden>
+
+       * Makefile.am (maintainer-check): Check for misuses of make,
+       autoconf, automake, aclocal, and perl in the testsuite.  Suggest
+       using $MAKE, $AUTOCONF, $AUTOMAKE, $ACLOCAL, and $PERL instead.
+       * tests/confsub.test: Use $AUTOCONF and $MAKE.
+       * tests/extra5.test, tests/extra6.test, tests/lex5.test,
+       tests/nobase.test, tests/nodist2.test, tests/pr204.test,
+       tests/pr224.test, tests/pr287.test, tests/strip.test,
+       tests/yacc8.test: Use $MAKE.
+
 2002-03-20  Alexandre Duret-Lutz  <address@hidden>
 
        Add support for two-dot versions.
Index: Makefile.am
===================================================================
RCS file: /cvs/automake/automake/Makefile.am,v
retrieving revision 1.185
diff -u -r1.185 Makefile.am
--- Makefile.am 2002/02/14 14:25:54     1.185
+++ Makefile.am 2002/03/21 09:05:30
@@ -145,6 +145,31 @@
          echo "Don't put AMDEP_TRUE substitution in automake.in" 1>&2; \
          exit 1; \
        fi
+## Tests should never call make directly.
+       @if grep -v '^#' $(srcdir)/tests/*.test | egrep ':[     ]*make'; then \
+         echo 'Do not run "make" in the above tests.  Use "$$MAKE" instead.' \
+         exit 1; \
+       fi
+## Tests should never call autoconf directly.
+       @if grep -v '^#' $(srcdir)/tests/*.test | egrep ':[     ]*autoconf'; 
then \
+         echo 'Do not run "autoconf" in the above tests.  Use "$$AUTOCONF" 
instead.' \
+         exit 1; \
+       fi
+## Tests should never call automake directly.
+       @if grep -v '^#' $(srcdir)/tests/*.test | egrep ':[     ]*automake'; 
then \
+         echo 'Do not run "automake" in the above tests.  Use "$$AUTOMAKE" 
instead.' \
+         exit 1; \
+       fi
+## Tests should never call aclocal directly.
+       @if grep -v '^#' $(srcdir)/tests/*.test | egrep ':[     ]*aclocal'; 
then \
+         echo 'Do not run "aclocal" in the above tests.  Use "$$ACLOCAL" 
instead.' \
+         exit 1; \
+       fi
+## Tests should never call perl directly.
+       @if grep -v '^#' $(srcdir)/tests/*.test | egrep ':[     ]*perl'; then \
+         echo 'Do not run "perl" in the above tests.  Use "$$PERL" instead.' \
+         exit 1; \
+       fi
 
 # Tag before making distribution.  Also, don't make a distribution if
 # checks fail.  Also, make sure the NEWS file is up-to-date.
Index: tests/confsub.test
===================================================================
RCS file: /cvs/automake/automake/tests/confsub.test,v
retrieving revision 1.16
diff -u -r1.16 confsub.test
--- confsub.test        2001/12/26 08:22:05     1.16
+++ confsub.test        2002/03/21 09:05:30
@@ -32,13 +32,13 @@
 (fgrep 'subdir/config.h' subdir/Makefile.in |
    fgrep -v 'cd $(top_builddir)') && exit 1
 
-autoconf || exit 1
+$AUTOCONF || exit 1
 ./configure || exit 1
 fgrep 'Before.' subdir/config.h
 
 sleep 1
 echo 'After.' > subdir/config.hin
-make || exit 1
+$MAKE || exit 1
 fgrep 'After.' subdir/config.h || exit 1
 
 exit 0
Index: tests/extra5.test
===================================================================
RCS file: /cvs/automake/automake/tests/extra5.test,v
retrieving revision 1.3
diff -u -r1.3 extra5.test
--- extra5.test 2001/12/26 08:22:05     1.3
+++ extra5.test 2002/03/21 09:05:30
@@ -23,4 +23,4 @@
 mkdir build
 cd build
 ../configure
-make distdir
+$MAKE distdir
Index: tests/extra6.test
===================================================================
RCS file: /cvs/automake/automake/tests/extra6.test,v
retrieving revision 1.1
diff -u -r1.1 extra6.test
--- extra6.test 2002/01/13 19:49:22     1.1
+++ extra6.test 2002/03/21 09:05:30
@@ -40,4 +40,4 @@
 mkdir baz2
 touch baz2/foo2
 
-make check
+$MAKE check
Index: tests/lex5.test
===================================================================
RCS file: /cvs/automake/automake/tests/lex5.test,v
retrieving revision 1.1
diff -u -r1.1 lex5.test
--- lex5.test   2002/02/25 11:00:35     1.1
+++ lex5.test   2002/03/21 09:05:31
@@ -66,7 +66,7 @@
 test -f ./ylwrap
 
 cd sub
-make foo/foo2.o
+$MAKE foo/foo2.o
 test -f foo/foo2.c
 test -f foo/foo2.o
 
Index: tests/nobase.test
===================================================================
RCS file: /cvs/automake/automake/tests/nobase.test,v
retrieving revision 1.4
diff -u -r1.4 nobase.test
--- nobase.test 2001/12/26 08:22:06     1.4
+++ nobase.test 2002/03/21 09:05:31
@@ -21,5 +21,5 @@
 $AUTOCONF
 $AUTOMAKE -a
 ./configure --prefix `pwd`/install
-make install-data
+$MAKE install-data
 test -f install/foo/bar/baz.h
Index: tests/nodist2.test
===================================================================
RCS file: /cvs/automake/automake/tests/nodist2.test,v
retrieving revision 1.1
diff -u -r1.1 nodist2.test
--- nodist2.test        2001/12/27 06:11:09     1.1
+++ nodist2.test        2002/03/21 09:05:31
@@ -20,4 +20,4 @@
 $AUTOCONF
 $AUTOMAKE -a
 ./configure --prefix `pwd`/install
-make install-data
+$MAKE install-data
Index: tests/pr204.test
===================================================================
RCS file: /cvs/automake/automake/tests/pr204.test,v
retrieving revision 1.1
diff -u -r1.1 pr204.test
--- pr204.test  2002/01/19 08:36:14     1.1
+++ pr204.test  2002/03/21 09:05:31
@@ -51,4 +51,4 @@
 test -f pr204-0.1/parse2.c && exit 1
 test -f pr204-0.1/parse2.y && exit 1
 # Make sure parse.c and parse2.c are still targets.
-make parse.c parse2.c
+$MAKE parse.c parse2.c
Index: tests/pr224.test
===================================================================
RCS file: /cvs/automake/automake/tests/pr224.test,v
retrieving revision 1.2
diff -u -r1.2 pr224.test
--- pr224.test  2002/01/23 20:53:28     1.2
+++ pr224.test  2002/03/21 09:05:31
@@ -41,6 +41,6 @@
 $MAKE
 
 test -d foo/.deps
-make distclean
+$MAKE distclean
 test -d foo/.deps && exit 1
 :
Index: tests/pr287.test
===================================================================
RCS file: /cvs/automake/automake/tests/pr287.test,v
retrieving revision 1.1
diff -u -r1.1 pr287.test
--- pr287.test  2002/01/13 20:33:40     1.1
+++ pr287.test  2002/03/21 09:05:31
@@ -32,5 +32,5 @@
 $AUTOCONF
 $AUTOMAKE -a
 ./configure --prefix=`cd install && pwd`
-make
-make distdir
+$MAKE
+$MAKE distdir
Index: tests/strip.test
===================================================================
RCS file: /cvs/automake/automake/tests/strip.test,v
retrieving revision 1.1
diff -u -r1.1 strip.test
--- strip.test  2002/01/01 23:28:40     1.1
+++ strip.test  2002/03/21 09:05:31
@@ -32,5 +32,5 @@
 $AUTOCONF
 $AUTOMAKE -a
 ./configure --prefix=`cd install && pwd`
-make
-make install-strip
+$MAKE
+$MAKE install-strip
Index: tests/yacc8.test
===================================================================
RCS file: /cvs/automake/automake/tests/yacc8.test,v
retrieving revision 1.2
diff -u -r1.2 yacc8.test
--- yacc8.test  2002/03/05 18:41:14     1.2
+++ yacc8.test  2002/03/21 09:05:31
@@ -61,7 +61,7 @@
 test -f ./ylwrap || exit 1
 
 cd sub
-make foo/parse2.o
+$MAKE foo/parse2.o
 test -f foo/parse2.c
 test -f foo/parse2.o
 
-- 
Alexandre Duret-Lutz