* Makefile.am (maintainer-check): Do not require SHELL=/bin/sh

after $MAKE -e.
* tests/ansi3.test, tests/ansi5.test, tests/cond22.test,
tests/man2.test, tests/subobj3.test, tests/suffix8.test,
tests/suffix11.test: Do not set SHELL=/bin/sh after $MAKE -e.
$SHELL is overridden by tests/defs, so it won't hurt even
if $MAKE -e uses the $SHELL envvar.
* tests/ansi.test, tests/insh2.test, tests/texinfo.test,
tests/texinfo8.test: Use SHELL=$SHELL, not SHELL=/bin/sh.
Reported by Richard Dawe.

diff --git a/ChangeLog b/ChangeLog
index 57dacf7c6f3afe79658133a3e6e928db59a23fcd..94abffe2cad29eb3210462f93fe699c9a2edef24 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2003-01-10  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * Makefile.am (maintainer-check): Do not require SHELL=/bin/sh
+       after $MAKE -e.
+       * tests/ansi3.test, tests/ansi5.test, tests/cond22.test,
+       tests/man2.test, tests/subobj3.test, tests/suffix8.test,
+       tests/suffix11.test: Do not set SHELL=/bin/sh after $MAKE -e.
+       $SHELL is overridden by tests/defs, so it won't hurt even
+       if $MAKE -e uses the $SHELL envvar.
+       * tests/ansi.test, tests/insh2.test, tests/texinfo.test,
+       tests/texinfo8.test: Use SHELL=$SHELL, not SHELL=/bin/sh.
+       Reported by Richard Dawe.
+
        Build elisp files all at once instead of one by one.
        * automake.in (handle_emacs_lisp): Define am__ELFILES.  Add
        elc-stamp to all's dependencies.

diff --git a/Makefile.am b/Makefile.am
index b89fd0484950b3bdc03945ee86b537546343faa3..8efc2dedd216ce7050e871716067d60700a9f94b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,8 +2,8 @@
 
 ## Makefile for Automake.
 
-## Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002 Free
-## Software Foundation, Inc.
+## Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003
+## Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -213,24 +213,17 @@ maintainer-check: automake aclocal
 ## recursive targets are used.  Better use an envvar.  SHELL is an exception,
 ## POSIX says it can't come from the environment.
        @if grep -E '\$$MAKE .*(SHELL=.*=|=.*SHELL=)' $(srcdir)/tests/*.test; then \
-         echo 'Rewrite "$$MAKE foo=bar SHELL=/bin/sh" as "foo=bar $$MAKE -e SHELL=/bin/sh"' 1>&2; \
+         echo 'Rewrite "$$MAKE foo=bar SHELL=$$SHELL" as "foo=bar $$MAKE -e SHELL=$$SHELL"' 1>&2; \
          echo ' in the above lines, it is more portable.' 1>&2; \
          exit 1; \
        fi
        @if grep -v SHELL $(srcdir)/tests/*.test | grep '\$$MAKE .*=' ; then \
-         echo 'Rewrite "$$MAKE foo=bar" as "foo=bar $$MAKE -e SHELL=/bin/sh" in the above lines,' 1>&2; \
+         echo 'Rewrite "$$MAKE foo=bar" as "foo=bar $$MAKE -e" 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 grep 'SHELL=.*\$$MAKE' $(srcdir)/tests/*.test; then \
-         echo '$$MAKE ignores the SHELL envvar, use "$$MAKE SHELL=/bin/sh" in' 1>&2; \
+         echo '$$MAKE ignores the SHELL envvar, use "$$MAKE SHELL=$$SHELL" in' 1>&2; \
          echo 'the above lines.' 1>&2; \
          exit 1; \
        fi

diff --git a/Makefile.in b/Makefile.in
index c2b5d54cbaac69cd884389e8e2d509d5ef5d5979..9ec14ce0246ed083c6d4574d6bc714a320f8ce22 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -790,22 +790,17 @@ maintainer-check: automake aclocal
          exit 1; \
        fi
        @if grep -E '\$$MAKE .*(SHELL=.*=|=.*SHELL=)' $(srcdir)/tests/*.test; then \
-         echo 'Rewrite "$$MAKE foo=bar SHELL=/bin/sh" as "foo=bar $$MAKE -e SHELL=/bin/sh"' 1>&2; \
+         echo 'Rewrite "$$MAKE foo=bar SHELL=$$SHELL" as "foo=bar $$MAKE -e SHELL=$$SHELL"' 1>&2; \
          echo ' in the above lines, it is more portable.' 1>&2; \
          exit 1; \
        fi
        @if grep -v SHELL $(srcdir)/tests/*.test | grep '\$$MAKE .*=' ; then \
-         echo 'Rewrite "$$MAKE foo=bar" as "foo=bar $$MAKE -e SHELL=/bin/sh" in the above lines,' 1>&2; \
+         echo 'Rewrite "$$MAKE foo=bar" as "foo=bar $$MAKE -e" 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 grep 'SHELL=.*\$$MAKE' $(srcdir)/tests/*.test; then \
-         echo '$$MAKE ignores the SHELL envvar, use "$$MAKE SHELL=/bin/sh" in' 1>&2; \
+         echo '$$MAKE ignores the SHELL envvar, use "$$MAKE SHELL=$$SHELL" in' 1>&2; \
          echo 'the above lines.' 1>&2; \
          exit 1; \
        fi

diff --git a/THANKS b/THANKS
index 78754ee522b79d7b70d66b0e47b75159d5a44bf8..deaa7e1747381d6e17f5a223e3781163f4e3e123 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -173,6 +173,7 @@ Ralph Schleicher    rs@purple.UL.BaWue.DE
 Ramón García Fernández ramon@jl1.quim.ucm.es
 Rich Wales             richw@webcom.com
 Richard Boulton                richard@tartarus.org
+Richard Dawe           rich@phekda.freeserve.co.uk
 Rob Savoye             rob@cygnus.com
 Robert Bihlmeyer       robbe@orcus.priv.at
 Robert Boehne          rboehne@ricardo-us.com

diff --git a/lib/elisp-comp b/lib/elisp-comp
index 031f00df9eab8852019f97a0e19d85d120549d69..6a8a6553df04f5c0c28124973dedefdfc1da732c 100755 (executable)
--- a/lib/elisp-comp
+++ b/lib/elisp-comp
@@ -43,6 +43,8 @@ fi
 
 tempdir=elc.$$
 
+
+
 # Cleanup the temporary directory on exit.
 trap 'status=$?; rm -rf "$tempdir" && exit $status' 0
 trap '(exit $?); exit' 1 2 13 15

diff --git a/tests/ansi.test b/tests/ansi.test
index 780a36893c24630b496d58569af692066c74cd68..0575e6269f681e5c2ae8ed3accf6459b2b08fcfd 100755 (executable)
--- a/tests/ansi.test
+++ b/tests/ansi.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002
+# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
@@ -41,4 +41,4 @@ $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 $FGREP -v @SET_MAKE@ Makefile.in > Makefile.sed
-$MAKE -s -f Makefile.sed SHELL=/bin/sh magic | grep 'ansi2knr\.c'
+$MAKE -s -f Makefile.sed SHELL=$SHELL magic | grep 'ansi2knr\.c'

diff --git a/tests/ansi3.test b/tests/ansi3.test
index e10a7986a021abf5ceed5b5f2abf87b2464bc510..2bc57042812887f0b2d63fb336e1b4e3805f5501 100755 (executable)
--- a/tests/ansi3.test
+++ b/tests/ansi3.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1998, 1999, 2001, 2002, 2003  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -57,5 +57,5 @@ $ACLOCAL \
    && $AUTOCONF \
    && $AUTOMAKE -a \
    && CC='gcc' ./configure \
-   && ANSI2KNR=./ansi2knr U=_ $MAKE -e SHELL=/bin/sh \
+   && ANSI2KNR=./ansi2knr U=_ $MAKE -e \
    && ./hello

diff --git a/tests/ansi5.test b/tests/ansi5.test
index 4e50458b54634f90afce0b982756742ba4bcca1f..f10deba80a054ed695c6a22d20a06465dcfcbe1c 100755 (executable)
--- a/tests/ansi5.test
+++ b/tests/ansi5.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -90,6 +90,6 @@ done
 mv one/Makefile one/Makefile.old
 sed -e 's,ANSI2KNR =,ANSI2KNR = ./ansi2knr,' < one/Makefile.old > one/Makefile
 
-U=_ $MAKE -e SHELL=/bin/sh
+U=_ $MAKE -e
 ./one/joe
 ./two/maude

diff --git a/tests/cond22.test b/tests/cond22.test
index f911e8ce7aa82a8dea6699acd0261407482e99d4..dc1289d2c921813ba46e7fa7d0b7a475c3e43786 100755 (executable)
--- a/tests/cond22.test
+++ b/tests/cond22.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -68,6 +68,6 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE
 ./configure
-OBJEXT=oo $MAKE -e SHELL=/bin/sh echo > output
+OBJEXT=oo $MAKE -e echo > output
 cat output
 $FGREP 'BEG: one.oo two.oo three.oo three2.oo :END' output

diff --git a/tests/insh2.test b/tests/insh2.test
index 6c867914cb03eb549969b3c050e3460194aee46b..4742205d48c071891c0e43eb3fa77ab623fe77a3 100755 (executable)
--- a/tests/insh2.test
+++ b/tests/insh2.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002
+# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
@@ -33,4 +33,4 @@ $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 $FGREP -v @SET_MAKE@ Makefile.in > Makefile.sed
-$MAKE -s -f Makefile.sed SHELL=/bin/sh magic | grep install-sh
+$MAKE -s -f Makefile.sed SHELL=$SHELL magic | grep install-sh

diff --git a/tests/man2.test b/tests/man2.test
index e8318d38f2655d150582552bbf27e5dc46ffa2ce..eba1bee633c776b1098b44aa6733a6b43f273dd2 100755 (executable)
--- a/tests/man2.test
+++ b/tests/man2.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -42,13 +42,13 @@ $AUTOMAKE
 
 # Let's play with $DESTDIR too, it shouldn't hurt.
 ./configure --prefix=''
-DESTDIR="`pwd`/=inst" $MAKE -e SHELL=/bin/sh install
+DESTDIR="`pwd`/=inst" $MAKE -e install
 
 test -f ./=inst/man/man2/foo.2
 test -f ./=inst/man/man4/foo.4
 test -f ./=inst/man/man4/bar.4
 
-DESTDIR="`pwd`/=inst" $MAKE -e SHELL=/bin/sh uninstall
+DESTDIR="`pwd`/=inst" $MAKE -e uninstall
 
 test ! -f ./=inst/man/man2/foo.2
 test ! -f ./=inst/man/man4/foo.4

diff --git a/tests/subobj3.test b/tests/subobj3.test
index 3a60ec7c38950a016d02afaf65b78a6b6e922dfb..6950ef0a8a0c7370c5e3706456d4c40613d8615f 100755 (executable)
--- a/tests/subobj3.test
+++ b/tests/subobj3.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1999, 2000, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -61,5 +61,5 @@ $ACLOCAL \
    && $AUTOCONF \
    && $AUTOMAKE -a \
    && ./configure \
-   && ANSI2KNR=./ansi2knr U=_ $MAKE -e SHELL=/bin/sh \
+   && ANSI2KNR=./ansi2knr U=_ $MAKE -e \
    && ./hello

diff --git a/tests/suffix11.test b/tests/suffix11.test
index 4dac1e5288236dc587c3b31d08c5c7a14bc14a77..1ba71ba5222491a606fab06218a36ff7fe7bf1c1 100755 (executable)
--- a/tests/suffix11.test
+++ b/tests/suffix11.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -56,7 +56,7 @@ grep 'Inference rules can have only one target before the colon' stderr
 # But this should work anyway.
 $AUTOMAKE -a -Wno-portability
 ./configure
-env OBJEXT=foo $MAKE -e SHELL=/bin/sh print >stdout
+env OBJEXT=foo $MAKE -e print >stdout
 cat stdout
 grep 'BEGIN: foo.foo :END' stdout
 grep 'BEGIN: bar.foo :END' stdout

diff --git a/tests/suffix8.test b/tests/suffix8.test
index a798dbeaea10bc4e7cff3016dca46366553ae176..7a475285d6ec6092d337f97628101635f881ff97 100755 (executable)
--- a/tests/suffix8.test
+++ b/tests/suffix8.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -73,7 +73,7 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE -a
 ./configure
-env OBJEXT=foo $MAKE -e SHELL=/bin/sh print >stdout
+env OBJEXT=foo $MAKE -e print >stdout
 cat stdout
 grep 'BEGIN: foo.foo :END' stdout
 grep 'BEGIN: bar.lo :END' stdout

diff --git a/tests/texinfo.test b/tests/texinfo.test
index 478ccf97b3f2a41850e72a4c54d7f65d5bcebecb..4d3949ed75428b9cd3633470777d11c700463a37 100755 (executable)
--- a/tests/texinfo.test
+++ b/tests/texinfo.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002
+# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
@@ -37,4 +37,4 @@ $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 $FGREP -v @SET_MAKE@ Makefile.in > Makefile.sed
-$MAKE -s -f Makefile.sed SHELL=/bin/sh magic | grep 'texinfo\.tex'
+$MAKE -s -f Makefile.sed SHELL=$SHELL magic | grep 'texinfo\.tex'

diff --git a/tests/texinfo8.test b/tests/texinfo8.test
index cee156c4488da9096f3b421b3cb074da100836ed..db9aebc550acb03c1423fd811b963361faf0f767 100755 (executable)
--- a/tests/texinfo8.test
+++ b/tests/texinfo8.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1999, 2000, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -49,7 +49,7 @@ $AUTOMAKE -a || exit 1
 
 $FGREP -v @SET_MAKE@ sub/Makefile.in > sub/Makefile.sed
 test -f sub/texinfo.tex &&
-$MAKE -s -f sub/Makefile.sed SHELL=/bin/sh magic | grep 'texinfo\.tex'
+$MAKE -s -f sub/Makefile.sed SHELL=$SHELL magic | grep 'texinfo\.tex'
 stat=$?
 
 exit $stat