* Makefile.am (maintainer-check): Make sure `$MAKE -e' is

always followed by a SHELL setting.
* tests/ansi3.test, tests/ansi5.test, tests/subobj3.test: Set
SHELL when calling `$MAKE -e'.

diff --git a/ChangeLog b/ChangeLog
index eccc3d110b31441fcdaf22907d12f49ed378f76f..e2577e7e4cd2fb681097c97ddc67060e5ab9a229 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-04-10  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * Makefile.am (maintainer-check): Make sure `$MAKE -e' is
+       always followed by a SHELL setting.
+       * tests/ansi3.test, tests/ansi5.test, tests/subobj3.test: Set
+       SHELL when calling `$MAKE -e'.
+
 2002-04-10  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
        * tests/subobj9.test: Use configure.in, not configure.ac,

diff --git a/Makefile.am b/Makefile.am
index 17765b303c212b8e09e75a1228be7041d0e69c4c..5e214b4e66482801f420ff51922d95fa65875bc0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -179,10 +179,17 @@ maintainer-check: automake aclocal
          exit 1; \
        fi
        @if grep -v SHELL $(srcdir)/tests/*.test | grep '\$$MAKE .*=' ; then \
-         echo 'Rewrite "$$MAKE foo=bar" as "foo=bar $$MAKE -e" in the above lines,' 1>&2; \
+         echo 'Rewrite "$$MAKE foo=bar" as "foo=bar $$MAKE -e SHELL=/bin/sh" in the above lines,' 1>&2; \
          echo 'it is more portable.' 1>&2; \
          exit 1; \
        fi
+## On NetBSD (1.5) and OSF, the $SHELL variable is still inherited from
+## the environment.
+       @if grep '$$MAKE.*-e' $(srcdir)/tests/*.test | grep -v '-e.*SHELL' ; then \
+         echo 'Always overwrite SHELL when using "$$MAKE -e".' 1>&2; \
+         echo 'Use "$$MAKE -e SHELL=/bin/sh" in the above lines.' 1>&2; \
+         exit 1; \
+       fi
        @if egrep 'SHELL=.*\$$MAKE' $(srcdir)/tests/*.test; then \
          echo '$$MAKE ignores the SHELL envvar, use "$$MAKE SHELL=/bin/sh" in' 1>&2; \
          echo 'the above lines.' 1>&2; \

diff --git a/Makefile.in b/Makefile.in
index 94c4aaee7de049acf03561a5141f2a36d09803cc..0f8fadbd5db904ce20ac57bfb29d23ca51ebf24c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -682,10 +682,15 @@ maintainer-check: automake aclocal
          exit 1; \
        fi
        @if grep -v SHELL $(srcdir)/tests/*.test | grep '\$$MAKE .*=' ; then \
-         echo 'Rewrite "$$MAKE foo=bar" as "foo=bar $$MAKE -e" in the above lines,' 1>&2; \
+         echo 'Rewrite "$$MAKE foo=bar" as "foo=bar $$MAKE -e SHELL=/bin/sh" in the above lines,' 1>&2; \
          echo 'it is more portable.' 1>&2; \
          exit 1; \
        fi
+       @if grep '$$MAKE.*-e' $(srcdir)/tests/*.test | grep -v '-e.*SHELL' ; then \
+         echo 'Always overwrite SHELL when using "$$MAKE -e".' 1>&2; \
+         echo 'Use "$$MAKE -e SHELL=/bin/sh" in the above lines.' 1>&2; \
+         exit 1; \
+       fi
        @if egrep 'SHELL=.*\$$MAKE' $(srcdir)/tests/*.test; then \
          echo '$$MAKE ignores the SHELL envvar, use "$$MAKE SHELL=/bin/sh" in' 1>&2; \
          echo 'the above lines.' 1>&2; \

diff --git a/tests/ansi3.test b/tests/ansi3.test
index ef7e7fb2d7ac4c1d16fe1a824f3eced512864783..0f62ff91822d3b74c3774ecff7fa4b3733e98bfd 100755 (executable)
--- a/tests/ansi3.test
+++ b/tests/ansi3.test
@@ -41,5 +41,5 @@ $ACLOCAL \
    && $AUTOCONF \
    && $AUTOMAKE -a \
    && CC='gcc' ./configure \
-   && ANSI2KNR=./ansi2knr U=_ $MAKE -e \
+   && ANSI2KNR=./ansi2knr U=_ $MAKE -e SHELL=/bin/sh \
    && ./hello

diff --git a/tests/ansi5.test b/tests/ansi5.test
index f9d56b5b6396be2478e40511180db49540d1b1f1..9659b4af712d0dccc33b643950177931a57a5b0f 100755 (executable)
--- a/tests/ansi5.test
+++ b/tests/ansi5.test
@@ -73,6 +73,6 @@ done
 mv one/Makefile one/Makefile.old
 sed -e 's,ANSI2KNR =,ANSI2KNR = ./ansi2knr,' < one/Makefile.old > one/Makefile
 
-U=_ $MAKE -e
+U=_ $MAKE -e SHELL=/bin/sh
 ./one/joe
 ./two/maude

diff --git a/tests/subobj3.test b/tests/subobj3.test
index 9be2fa81407a37061ead76f5003d21d2a8dbbf20..e39ff558ec03f1cd3068cf2cee837c8a97d4a318 100755 (executable)
--- a/tests/subobj3.test
+++ b/tests/subobj3.test
@@ -45,5 +45,5 @@ $ACLOCAL \
    && $AUTOCONF \
    && $AUTOMAKE -a \
    && CC='gcc' ./configure \
-   && ANSI2KNR=./ansi2knr U=_ $MAKE -e \
+   && ANSI2KNR=./ansi2knr U=_ $MAKE -e SHELL=/bin/sh \
    && ./hello