* ansi.test, texinfo.test, empty.test, insh2.test, texinfo8.test:

	Remove @SET_MAKE@ before using Makefile.
	* backsl2.test: Don't add AC_PROG_MAKE_SET in configure.in;
	already done.
	* defs: Put AC_PROG_MAKE_SET in configure.in.
	* acoutnoq.test, acoutput.test, acoutqnl.test, acouttbs.test,
	acouttbs2.test, colon.test, colon2.test, colon3.test, colon4.test,
	colon5.test, colon6.test, colon7.test, conf2.test, confh.test,
	confh2.test, confh3.test, confh4.test, config.test, depend3.test,
	discover.test, fpinst2.test, gnits.test, ldadd.test, libobj.test,
	libobj10.test, libobj2.test, libobj6.test, libobj7.test,
	libobj8.test, libobj9.test, output.test, output2.test,
	output3.test, output4.test, output5.test, package.test,
	parse.test, pr2.test, remake.test, remake2.test, scripts.test,
	stamph.test, texinfo8.test: Likewise.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 33779b665622c9192300f6dfae0b58baf3432efc..f35fb488b29a1d4a800611b5774cc57a47b65f8d 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,21 @@
+2000-01-08  Tom Tromey  <tromey@cygnus.com>
+
+       * ansi.test, texinfo.test, empty.test, insh2.test, texinfo8.test:
+       Remove @SET_MAKE@ before using Makefile.
+       * backsl2.test: Don't add AC_PROG_MAKE_SET in configure.in;
+       already done.
+       * defs: Put AC_PROG_MAKE_SET in configure.in.
+       * acoutnoq.test, acoutput.test, acoutqnl.test, acouttbs.test,
+       acouttbs2.test, colon.test, colon2.test, colon3.test, colon4.test,
+       colon5.test, colon6.test, colon7.test, conf2.test, confh.test,
+       confh2.test, confh3.test, confh4.test, config.test, depend3.test,
+       discover.test, fpinst2.test, gnits.test, ldadd.test, libobj.test,
+       libobj10.test, libobj2.test, libobj6.test, libobj7.test,
+       libobj8.test, libobj9.test, output.test, output2.test,
+       output3.test, output4.test, output5.test, package.test,
+       parse.test, pr2.test, remake.test, remake2.test, scripts.test,
+       stamph.test, texinfo8.test: Likewise.
+
 1999-12-26  Tom Tromey  <tromey@cygnus.com>
 
        * subobj3.test: Remove depcomp.

diff --git a/tests/acoutnoq.test b/tests/acoutnoq.test
index f753800e73bd6c252b78355389b34edbd1892d64..bdda3b282bc327c52b464aef24f54c3de1425ea2 100755 (executable)
--- a/tests/acoutnoq.test
+++ b/tests/acoutnoq.test
@@ -13,6 +13,7 @@ PACKAGE=nonesuch
 VERSION=nonesuch
 AC_ARG_PROGRAM
 AC_PROG_INSTALL
+AC_PROG_MAKE_SET
 AC_OUTPUT(Makefile, [true])
 END
 

diff --git a/tests/acoutput.test b/tests/acoutput.test
index 53c59d03e6c2a3826101bb4d8f07c447ba2003f9..e9fe4f9fdf7e928b0226f3e9443ba855258dac1f 100755 (executable)
--- a/tests/acoutput.test
+++ b/tests/acoutput.test
@@ -10,6 +10,7 @@ PACKAGE=nonesuch
 VERSION=nonesuch
 AC_ARG_PROGRAM
 AC_PROG_INSTALL
+AC_PROG_MAKE_SET
 AC_OUTPUT([Makefile], [true])
 END
 

diff --git a/tests/acoutqnl.test b/tests/acoutqnl.test
index 94c909d998992f8996661825c5785cd50e6bc4a5..bcfb016261ac1ecee9028556924e70780642e0cf 100755 (executable)
--- a/tests/acoutqnl.test
+++ b/tests/acoutqnl.test
@@ -9,6 +9,7 @@ PACKAGE=nonesuch
 VERSION=nonesuch
 AC_ARG_PROGRAM
 AC_PROG_INSTALL
+AC_PROG_MAKE_SET
 AC_OUTPUT([Makefile],
 [echo zardoz has spoken])
 END

diff --git a/tests/acouttbs.test b/tests/acouttbs.test
index 88be5d23d16b634ba901f41d938b4dd877375521..61a9c4f161cb1168afdd64d64c8b3f8d0bfd41fa 100755 (executable)
--- a/tests/acouttbs.test
+++ b/tests/acouttbs.test
@@ -10,6 +10,7 @@ PACKAGE=nonesuch
 VERSION=nonesuch
 AC_ARG_PROGRAM
 AC_PROG_INSTALL
+AC_PROG_MAKE_SET
 AC_OUTPUT(Makefile \
 zot)
 END

diff --git a/tests/acouttbs2.test b/tests/acouttbs2.test
index 417b180fab5c64648ab0b32c1d40ca24f313bb90..e1297812c0084a2e3da1e4450e60052d2c4efbf6 100755 (executable)
--- a/tests/acouttbs2.test
+++ b/tests/acouttbs2.test
@@ -10,6 +10,7 @@ PACKAGE=nonesuch
 VERSION=nonesuch
 AC_ARG_PROGRAM
 AC_PROG_INSTALL
+AC_PROG_MAKE_SET
 AC_OUTPUT(\
    Makefile \
    zot

diff --git a/tests/ansi.test b/tests/ansi.test
index 1140cadcb6f76126bb8f73b76d065000f3e4696b..0e133c29802ac1e33f2bdfae336fea950223e0d7 100755 (executable)
--- a/tests/ansi.test
+++ b/tests/ansi.test
@@ -20,4 +20,5 @@ END
 
 $AUTOMAKE || exit 1
 
-$MAKE -s -f Makefile.in SHELL=/bin/sh magic | grep 'ansi2knr\.c'
+fgrep -v @SET_MAKE@ Makefile.in > Makefile.sed
+$MAKE -s -f Makefile.sed SHELL=/bin/sh magic | grep 'ansi2knr\.c'

diff --git a/tests/backsl2.test b/tests/backsl2.test
index c9c13674b7fcbff7c81d48540b0347aba753e531..9d3dcb2c6cc62afd2a22e5b00d54312343f8ddd5 100755 (executable)
--- a/tests/backsl2.test
+++ b/tests/backsl2.test
@@ -5,8 +5,6 @@
 
 . $srcdir/defs || exit 1
 
-echo 'AC_PROG_MAKE_SET' >> configure.in
-
 cat > Makefile.am << 'END'
 SUBDIRS = \
    .

diff --git a/tests/colon.test b/tests/colon.test
index 672bb54b7b01a23723aa767c91ab057ddbc40ac1..b5888da9b9126728038e448265d11cee9c89022d 100755 (executable)
--- a/tests/colon.test
+++ b/tests/colon.test
@@ -10,6 +10,7 @@ PACKAGE=nonesuch
 VERSION=nonesuch
 AC_ARG_PROGRAM
 AC_PROG_INSTALL
+AC_PROG_MAKE_SET
 AC_OUTPUT(Makefile foo.h:foo.hin)
 END
 

diff --git a/tests/colon2.test b/tests/colon2.test
index feeda98ee6d69466fbee755c2daf101cc07bd8dc..c1a45b123f316406be8a99f8c6f94a9ce1072f88 100755 (executable)
--- a/tests/colon2.test
+++ b/tests/colon2.test
@@ -8,6 +8,7 @@ cat > configure.in << 'END'
 PACKAGE=nonesuch
 VERSION=nonesuch
 AC_ARG_PROGRAM
+AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_OUTPUT(Makefile:zardoz.in)
 END

diff --git a/tests/colon3.test b/tests/colon3.test
index 41ee2127ad2bb9312dfeb689c784c5baf092be2f..3fcd87293aeb205a3c472aeb13b57a2915fafea0 100755 (executable)
--- a/tests/colon3.test
+++ b/tests/colon3.test
@@ -10,6 +10,7 @@ PACKAGE=nonesuch
 VERSION=nonesuch
 AC_ARG_PROGRAM
 AC_PROG_INSTALL
+AC_PROG_MAKE_SET
 AC_OUTPUT(Makefile:zardoz.in:two.in:three.in)
 END
 

diff --git a/tests/colon4.test b/tests/colon4.test
index c94059def1890e9d0e3817359c29a7b739f0cb53..43f3d3b8dc0cfe343c24939ef8db67eb4f1f3d79 100755 (executable)
--- a/tests/colon4.test
+++ b/tests/colon4.test
@@ -10,6 +10,7 @@ cat > configure.in << 'END'
 PACKAGE=nonesuch
 VERSION=nonesuch
 AC_ARG_PROGRAM
+AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_OUTPUT(Makefile zardoz:one:two:three)
 END

diff --git a/tests/colon5.test b/tests/colon5.test
index f1ca626418f220042b68d0645d6d923f3ccd9890..9394d8f249805d6a39f1124694afe8f4aefbaad6 100755 (executable)
--- a/tests/colon5.test
+++ b/tests/colon5.test
@@ -8,6 +8,7 @@ cat > configure.in << 'END'
 PACKAGE=nonesuch
 VERSION=nonesuch
 AC_ARG_PROGRAM
+AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_OUTPUT(Makefile:Makefile.in:Makefile.dep)
 END

diff --git a/tests/colon6.test b/tests/colon6.test
index f156d3e429f5debc7531401a3928600361a5bc3b..a402d6d7491f2afcc634d3571e6cf224f776822d 100755 (executable)
--- a/tests/colon6.test
+++ b/tests/colon6.test
@@ -8,6 +8,7 @@ cat > configure.in << 'END'
 PACKAGE=nonesuch
 VERSION=nonesuch
 AC_ARG_PROGRAM
+AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_OUTPUT(demo/Makefile demo/version.good:demo/version.gin)
 END

diff --git a/tests/colon7.test b/tests/colon7.test
index 0e57f925e3b5371258f6d5b766f97fad00884fa6..e921a125b93dd825ee6a8981b75571eae1050e68 100755 (executable)
--- a/tests/colon7.test
+++ b/tests/colon7.test
@@ -9,6 +9,7 @@ cat > configure.in << 'END'
 PACKAGE=nonesuch
 VERSION=nonesuch
 AC_ARG_PROGRAM
+AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_OUTPUT(subdir/bar:subdir/foo \
    Makefile \

diff --git a/tests/conf2.test b/tests/conf2.test
index 52a02650c45df5a157365147d6d6b2debb547dc7..9638e39105dd09174aeda3c0d643258565b542d4 100755 (executable)
--- a/tests/conf2.test
+++ b/tests/conf2.test
@@ -10,6 +10,7 @@ PACKAGE=nonesuch
 VERSION=nonesuch
 AC_PROG_CC
 AC_ARG_PROGRAM
+AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_OUTPUT(Makefile)
 END

diff --git a/tests/confh.test b/tests/confh.test
index 63dd433f86e61aaaaf561e5d076e10128efb8f65..e183c7a685f5258a90f42e6c7967f582f358756d 100755 (executable)
--- a/tests/confh.test
+++ b/tests/confh.test
@@ -10,6 +10,7 @@ PACKAGE=nonesuch
 VERSION=nonesuch
 AC_ARG_PROGRAM
 AC_PROG_INSTALL
+AC_PROG_MAKE_SET
 AM_CONFIG_HEADER(include/config.h)
 AC_OUTPUT(Makefile include/Makefile)
 END

diff --git a/tests/confh2.test b/tests/confh2.test
index 45b64f8f6711ce68b111d4a686de2c1c0a3b2533..cef816b3d5e9d0dc2159925eff85c93b76c0ebff 100755 (executable)
--- a/tests/confh2.test
+++ b/tests/confh2.test
@@ -10,6 +10,7 @@ PACKAGE=nonesuch
 VERSION=nonesuch
 AC_ARG_PROGRAM
 AC_PROG_INSTALL
+AC_PROG_MAKE_SET
 AM_CONFIG_HEADER(config.h:include/config.h.in)
 AC_OUTPUT(Makefile)
 END

diff --git a/tests/confh3.test b/tests/confh3.test
index 8cfe589533c020bc063a7f688114a7e350e9f06a..9bd8aefdfc0d02d7ece329da25a7bb0f0c2528c4 100755 (executable)
--- a/tests/confh3.test
+++ b/tests/confh3.test
@@ -10,6 +10,7 @@ PACKAGE=nonesuch
 VERSION=nonesuch
 AC_ARG_PROGRAM
 AC_PROG_INSTALL
+AC_PROG_MAKE_SET
 AM_CONFIG_HEADER(d1/config.h:d2/config.h.in)
 AC_OUTPUT(Makefile d1/Makefile)
 END

diff --git a/tests/confh4.test b/tests/confh4.test
index bae467ec37e6f9fef32a9e573c31885696ef68e0..af41ca988f385a7ec2ab6f9ddb91ced23ba48582 100755 (executable)
--- a/tests/confh4.test
+++ b/tests/confh4.test
@@ -10,6 +10,7 @@ VERSION=nonesuch
 AC_ARG_PROGRAM
 AC_PROG_INSTALL
 AM_CONFIG_HEADER(include/config.h)
+AC_PROG_MAKE_SET
 AC_PROG_CC
 AC_OUTPUT(Makefile include/Makefile)
 END

diff --git a/tests/config.test b/tests/config.test
index cbe6ba7b19786468a4764f9452037693c3df9225..562c147abe8ba4e365fdd5432da30a300bbb32a2 100755 (executable)
--- a/tests/config.test
+++ b/tests/config.test
@@ -12,6 +12,7 @@ PACKAGE=nonesuch
 VERSION=nonesuch
 AC_PROG_CC
 AC_ARG_PROGRAM
+AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_OUTPUT(Makefile)
 END

diff --git a/tests/defs b/tests/defs
index ec937ead86066aa737e8be97f1152db55eb6b3a5..4e41f16bb37e86002c950a517de71bb2e4bb932d 100644 (file)
--- a/tests/defs
+++ b/tests/defs
@@ -31,6 +31,7 @@ PACKAGE=nonesuch
 VERSION=nonesuch
 AC_ARG_PROGRAM
 AC_PROG_INSTALL
+AC_PROG_MAKE_SET
 AC_OUTPUT(Makefile)
 END
 

diff --git a/tests/depend3.test b/tests/depend3.test
index 7ff4909ceed72ba3eeaa005ba41283d42bf16a5d..c047d34de09563af73d2c283ad1228956eb3a0f3 100755 (executable)
--- a/tests/depend3.test
+++ b/tests/depend3.test
@@ -10,6 +10,7 @@ VERSION=nonesuch
 AC_ARG_PROGRAM
 AC_PROG_INSTALL
 AC_PROG_CC
+AC_PROG_MAKE_SET
 AC_SUBST(DEPS)
 AC_OUTPUT(Makefile)
 END

diff --git a/tests/discover.test b/tests/discover.test
index 2daa9e7748be98bdf96e1427021f56fc00792f97..ac7485615d4ec2b6f3773c559ab6a5fff507cff8 100755 (executable)
--- a/tests/discover.test
+++ b/tests/discover.test
@@ -10,6 +10,7 @@ VERSION=nonesuch
 AC_ARG_PROGRAM
 AC_PROG_INSTALL
 AC_PROG_RANLIB
+AC_PROG_MAKE_SET
 AC_PROG_CC
 LIBOBJS="$LIBOBJS fsusage.o"
 AC_OUTPUT(Makefile)

diff --git a/tests/empty.test b/tests/empty.test
index 14a71245572d9220759fe2fdcac3d79060eab56b..112b2c6bdd8d697c8571bb56ff1a59bdaea8c6a6 100755 (executable)
--- a/tests/empty.test
+++ b/tests/empty.test
@@ -26,6 +26,6 @@ chmod +x mkinstalldirs
 # Substitute variables we need.
 sed -e 's,@SHELL@,/bin/sh,g' -e 's/@srcdir@/./g' \
    -e 's/@top_srcdir@/./g' -e 's/@datadir@/./g' \
-   < Makefile.in > Makefile
+   -e 's/@SET_MAKE@//g' < Makefile.in > Makefile
 
 $MAKE install

diff --git a/tests/fpinst2.test b/tests/fpinst2.test
index ed814cb849186eefe102357fce07b6d086c7146b..2b5032d4c90f8b7b5dbd5511f9a9368dd21c109a 100755 (executable)
--- a/tests/fpinst2.test
+++ b/tests/fpinst2.test
@@ -9,6 +9,7 @@ cat > configure.in << 'END'
 PACKAGE=nonesuch
 VERSION=nonesuch
 AC_ARG_PROGRAM
+AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_PROG_INSTALL
 AC_OUTPUT(Makefile)

diff --git a/tests/fpinstall.test b/tests/fpinstall.test
index d5ed8f47ddc53dabf89da92d9878513a4330a5ef..39f7cdcbfc48fa6088a15ab37e86d4294b41cef1 100755 (executable)
--- a/tests/fpinstall.test
+++ b/tests/fpinstall.test
@@ -9,6 +9,7 @@ cat > configure.in << 'END'
 PACKAGE=nonesuch
 VERSION=nonesuch
 AC_ARG_PROGRAM
+AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_PROG_INSTALL
 AC_OUTPUT(Makefile)

diff --git a/tests/gnits.test b/tests/gnits.test
index e4243be3d0b3b130f8c2c2d3100703473520d56a..131d2ace2e8ad220329b678ced3e2764ffdecd86 100755 (executable)
--- a/tests/gnits.test
+++ b/tests/gnits.test
@@ -8,6 +8,7 @@ cat > configure.in << 'END'
 PACKAGE=nonesuch
 VERSION=3.5.3.2
 AC_ARG_PROGRAM
+AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_OUTPUT(Makefile)
 END

diff --git a/tests/insh2.test b/tests/insh2.test
index ae4ea2c927fa085770e3b69184816c3636ee440e..9f35a6c20bd2a6487a3d7f2ce4dfdb023e730642 100755 (executable)
--- a/tests/insh2.test
+++ b/tests/insh2.test
@@ -12,4 +12,5 @@ END
 
 $AUTOMAKE || exit 1
 
-$MAKE -s -f Makefile.in SHELL=/bin/sh magic | grep install-sh
+fgrep -v @SET_MAKE@ Makefile.in > Makefile.sed
+$MAKE -s -f Makefile.sed SHELL=/bin/sh magic | grep install-sh

diff --git a/tests/ldadd.test b/tests/ldadd.test
index ef02aaabdc548e0bde2db004cf494f39ef55384b..2b7fbd45aef5b7789a066e9b9d7bac080c44acc6 100755 (executable)
--- a/tests/ldadd.test
+++ b/tests/ldadd.test
@@ -12,6 +12,7 @@ AC_ARG_PROGRAM
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
 AC_OUTPUT(Makefile)
+AC_PROG_MAKE_SET
 LTLIBOBJS="$LTLIBOBJS q.o"
 LIBOBJS="$LIBOBJS q.o"
 AC_SUBST(LTLIBOBJS)

diff --git a/tests/libobj.test b/tests/libobj.test
index 7918f86e6e77720675539dbd8df9d7de04872083..d1969a86960ba0e5f685d73897a88bb9ce0e81b4 100755 (executable)
--- a/tests/libobj.test
+++ b/tests/libobj.test
@@ -10,6 +10,7 @@ cat > configure.in << 'END'
 PACKAGE=nonesuch
 VERSION=nonesuch
 AC_PROG_CC
+AC_PROG_MAKE_SET
 AC_ARG_PROGRAM
 AC_PROG_INSTALL
 AC_PROG_RANLIB

diff --git a/tests/libobj10.test b/tests/libobj10.test
index d0bc7cb8a7d5d099f98205eefd4e6873b83814e2..ca0afc566b18b2d5b01ab26a2aec09d7fdb75c4b 100755 (executable)
--- a/tests/libobj10.test
+++ b/tests/libobj10.test
@@ -10,6 +10,7 @@ PACKAGE=nonesuch
 VERSION=nonesuch
 AC_PROG_CC
 AC_ARG_PROGRAM
+AC_PROG_MAKE_SET
 AC_PROG_RANLIB
 AC_PROG_INSTALL
 LIBOBJS="$LIBOBJS foo.o"

diff --git a/tests/libobj2.test b/tests/libobj2.test
index fa9b889d684b88083efb9a0365d0c263fa30f582..2e52cf2e6afd29dcee74e2795beb85fe6939f874 100755 (executable)
--- a/tests/libobj2.test
+++ b/tests/libobj2.test
@@ -9,6 +9,7 @@ cat > configure.in << 'END'
 PACKAGE=nonesuch
 VERSION=nonesuch
 AC_PROG_CC
+AC_PROG_MAKE_SET
 AC_ARG_PROGRAM
 AC_PROG_INSTALL
 AC_PROG_RANLIB

diff --git a/tests/libobj6.test b/tests/libobj6.test
index 9094cf578b2370c0d0177eea80169bff78cc5674..1f7004a2b5a6a618703543b256e5bb79efc5edb3 100755 (executable)
--- a/tests/libobj6.test
+++ b/tests/libobj6.test
@@ -9,6 +9,7 @@ cat > configure.in << 'END'
 PACKAGE=nonesuch
 VERSION=nonesuch
 AC_PROG_CC
+AC_PROG_MAKE_SET
 AC_ARG_PROGRAM
 AC_PROG_INSTALL
 AC_PROG_RANLIB

diff --git a/tests/libobj7.test b/tests/libobj7.test
index ed0d101e7275095d80ce677b5e0667b3983bc4c7..9351c20d0a591c29eea6a73075f48f7cc1a19485 100755 (executable)
--- a/tests/libobj7.test
+++ b/tests/libobj7.test
@@ -8,6 +8,7 @@ cat > configure.in << 'END'
 PACKAGE=nonesuch
 VERSION=nonesuch
 AC_PROG_CC
+AC_PROG_MAKE_SET
 AC_ARG_PROGRAM
 AC_PROG_INSTALL
 AC_PROG_RANLIB

diff --git a/tests/libobj8.test b/tests/libobj8.test
index a4b40907b39456f877732b7cb42e9916f86d69b6..77d8e0350880f29e0395489fb057e7a9d471a4d9 100755 (executable)
--- a/tests/libobj8.test
+++ b/tests/libobj8.test
@@ -9,6 +9,7 @@ cat > configure.in << 'END'
 PACKAGE=nonesuch
 VERSION=nonesuch
 AC_PROG_CC
+AC_PROG_MAKE_SET
 AC_ARG_PROGRAM
 AC_PROG_INSTALL
 AC_PROG_RANLIB

diff --git a/tests/libobj9.test b/tests/libobj9.test
index 286e4ff036b4624c59da788dd7b81d7000a3536e..823d6032776326939809bbf7bdee9aa9366dcc7f 100755 (executable)
--- a/tests/libobj9.test
+++ b/tests/libobj9.test
@@ -9,6 +9,7 @@ cat > configure.in << 'END'
 PACKAGE=nonesuch
 VERSION=nonesuch
 AC_PROG_CC
+AC_PROG_MAKE_SET
 AC_ARG_PROGRAM
 AC_PROG_INSTALL
 AC_PROG_RANLIB

diff --git a/tests/output.test b/tests/output.test
index dfb609cea735d792ffe587d6267515853b62a4ae..6a9d55b42dbee981d3d38c4fcd7b9104329f8828 100755 (executable)
--- a/tests/output.test
+++ b/tests/output.test
@@ -8,6 +8,7 @@ cat > configure.in << 'END'
 PACKAGE=nonesuch
 VERSION=nonesuch
 AC_ARG_PROGRAM
+AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_OUTPUT(Makefile frob/zardoz)
 END

diff --git a/tests/output2.test b/tests/output2.test
index 711de2d89d07c80940b6d0761b990c55c0d91037..608608eaa53534ce59efc37fff3f8223dd97864b 100755 (executable)
--- a/tests/output2.test
+++ b/tests/output2.test
@@ -8,6 +8,7 @@ cat > configure.in << 'END'
 PACKAGE=nonesuch
 VERSION=nonesuch
 AC_ARG_PROGRAM
+AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_OUTPUT(Makefile intl/intlh.inst po/Makefile.in misc/gettextize)
 END

diff --git a/tests/output3.test b/tests/output3.test
index 311fe03b28a47e928f057afa096e11a025b0a9db..c86f9ef28f1155da09f98ea334d90c926893e2fb 100755 (executable)
--- a/tests/output3.test
+++ b/tests/output3.test
@@ -8,6 +8,7 @@ cat > configure.in << 'END'
 PACKAGE=nonesuch
 VERSION=nonesuch
 AC_ARG_PROGRAM
+AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_OUTPUT([Makefile
 tests/Makefile tests/defs],

diff --git a/tests/output4.test b/tests/output4.test
index 91e960f54f1a7d6d1aab464ad2ae8f3bc4f6a11c..6bfd491069ee0e26f2d4e65db68536733778fced 100755 (executable)
--- a/tests/output4.test
+++ b/tests/output4.test
@@ -8,6 +8,7 @@ cat > configure.in << 'END'
 PACKAGE=nonesuch
 VERSION=nonesuch
 AC_ARG_PROGRAM
+AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_OUTPUT(tests/Makefile tests/defs)
 END

diff --git a/tests/output5.test b/tests/output5.test
index 8bfd99f0a790ccfc0502758a1fe1ce46a41e12f4..d490a3ec9573130e68deb498acda6c340e2a2f94 100755 (executable)
--- a/tests/output5.test
+++ b/tests/output5.test
@@ -8,6 +8,7 @@ cat > configure.in << 'END'
 PACKAGE=nonesuch
 VERSION=nonesuch
 AC_ARG_PROGRAM
+AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_OUTPUT()
 END

diff --git a/tests/package.test b/tests/package.test
index f920d7e6fb050631a3fb0835e668b3555a1df1c0..a8f84e9c50c6d51286b5bef9eeb5c8e33dc3fa3a 100755 (executable)
--- a/tests/package.test
+++ b/tests/package.test
@@ -6,6 +6,7 @@
 
 cat > configure.in << 'END'
 AC_ARG_PROGRAM
+AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_OUTPUT(Makefile)
 END

diff --git a/tests/parse.test b/tests/parse.test
index fb7cec5147f5469815dfc5c9acc7d7d537a61bd3..53d7767910ff99976b1b535d214aab562b56417a 100755 (executable)
--- a/tests/parse.test
+++ b/tests/parse.test
@@ -8,6 +8,7 @@ cat > configure.in << 'END'
 PACKAGE=nonesuch
 VERSION=nonesuch
 AC_PROG_CC
+AC_PROG_MAKE_SET
 AC_ARG_PROGRAM
 AC_PROG_INSTALL
 AC_PROG_RANLIB

diff --git a/tests/pr2.test b/tests/pr2.test
index 5c4632c6b81fa3742f5719e4fef1f3849fcf473e..0f1c5f042ef0d99516e23aaf3b469d00cbb72d0e 100755 (executable)
--- a/tests/pr2.test
+++ b/tests/pr2.test
@@ -8,6 +8,7 @@ cat > configure.in << 'END'
 PACKAGE=nonesuch
 VERSION=nonesuch
 AC_ARG_PROGRAM
+AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_OUTPUT(README.foo:templ/README.foo.in Makefile)
 END

diff --git a/tests/remake.test b/tests/remake.test
index cf2876516e2568d848da51bafb4b154b6feef335..c02b3a3bbfd3dff0ebac1c3a3635b268dc4fab26 100755 (executable)
--- a/tests/remake.test
+++ b/tests/remake.test
@@ -8,6 +8,7 @@ cat > configure.in << 'END'
 PACKAGE=nonesuch
 VERSION=nonesuch
 AC_ARG_PROGRAM
+AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_OUTPUT(sub/Makefile)
 END

diff --git a/tests/remake2.test b/tests/remake2.test
index b8b804400b31359153accdd00010d98a8fb786bd..f0012603aa12d23d2b55e14579acd742dc6d51e6 100755 (executable)
--- a/tests/remake2.test
+++ b/tests/remake2.test
@@ -8,6 +8,7 @@ cat > configure.in << 'END'
 PACKAGE=nonesuch
 VERSION=nonesuch
 AC_ARG_PROGRAM
+AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_OUTPUT(sub/Makefile)
 END

diff --git a/tests/scripts.test b/tests/scripts.test
index 6f7c15ad1d2f426c1fb37ed8e808de1d75786dde..a3f29c780ce2965a9dda12355f83e5fd17a48599 100755 (executable)
--- a/tests/scripts.test
+++ b/tests/scripts.test
@@ -8,6 +8,7 @@
 cat > configure.in << 'END'
 PACKAGE=nonesuch
 VERSION=nonesuch
+AC_PROG_MAKE_SET
 AC_ARG_PROGRAM
 AC_PROG_INSTALL
 AC_OUTPUT(Makefile)

diff --git a/tests/stamph.test b/tests/stamph.test
index bf3b3f77a08f3c6e371fcbeef97a2e9266d5b436..41019c3e46e8e35fb760581ea8e7194c8f31da94 100755 (executable)
--- a/tests/stamph.test
+++ b/tests/stamph.test
@@ -8,6 +8,7 @@ cat > configure.in << 'END'
 PACKAGE=nonesuch
 VERSION=nonesuch
 AC_ARG_PROGRAM
+AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_OUTPUT(Makefile stamp-h)
 END

diff --git a/tests/texinfo.test b/tests/texinfo.test
index 14218671c23816858aa453b6a9b86f8eac79dbe0..77b1538f647b489ed731b251c15c54842a5f25f4 100755 (executable)
--- a/tests/texinfo.test
+++ b/tests/texinfo.test
@@ -16,4 +16,5 @@ echo '@setfilename textutils.info' > textutils.texi
 
 $AUTOMAKE || exit 1
 
-$MAKE -s -f Makefile.in SHELL=/bin/sh magic | grep 'texinfo\.tex'
+fgrep -v @SET_MAKE@ Makefile.in > Makefile.sed
+$MAKE -s -f Makefile.sed SHELL=/bin/sh magic | grep 'texinfo\.tex'

diff --git a/tests/texinfo8.test b/tests/texinfo8.test
index d68e8488b3d0db6c3b655cef971de34dc83fca13..4607e4c2c0c9813fa531bde4b1ec97764de698ea 100755 (executable)
--- a/tests/texinfo8.test
+++ b/tests/texinfo8.test
@@ -10,6 +10,7 @@ cat > configure.in << 'END'
 PACKAGE=nonesuch
 VERSION=nonesuch
 AC_ARG_PROGRAM
+AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_OUTPUT(Makefile sub/Makefile)
 AC_CONFIG_AUX_DIR(sub)
@@ -30,8 +31,9 @@ END
 
 $AUTOMAKE -a || exit 1
 
+fgrep -v @SET_MAKE@ sub/Makefile.in > sub/Makefile.sed
 test -f sub/texinfo.tex &&
-$MAKE -s -f sub/Makefile.in SHELL=/bin/sh magic | grep 'texinfo\.tex'
+$MAKE -s -f sub/Makefile.sed SHELL=/bin/sh magic | grep 'texinfo\.tex'
 stat=$?
 
 exit $stat