* tests/make.test: Revert the grep logic to work around a bug

in NetBSD sh (see NetBSD Problem Report #11542).
Reported by Patrick Welche.

diff --git a/ChangeLog b/ChangeLog
index 9e92e16d4836eba0104abf83889a6ce51b49ea30..f6924d01a24eb551f814c59d1bb0a10e50e99de4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-22  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * tests/make.test: Revert the grep logic to work around a bug
+       in NetBSD sh (see NetBSD Problem Report #11542).
+       Reported by Patrick Welche.
+
 2002-02-20  Tim Van Holder  <tim.van.holder@pandora.be>
 
        * m4/lispdir.m4: Redirect /dev/null to stdin when running $EMACS

diff --git a/THANKS b/THANKS
index 047de321c841198aeb096ec34d9e987e310cb326..5339c43dbccd467adceb64d15572a44f474d6d8e 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -126,6 +126,7 @@ Nyul Laszlo         nyul@sol.cc.u-szeged.hu
 OKUJI Yoshinori                okuji@kuicr.kyoto-u.ac.jp
 Olivier Louchart-Fletcher olivier@zipworld.com.au
 Olly Betts             olly@muscat.co.uk
+Patrick Welche         prlw1@newn.cam.ac.uk
 Paul Berrevoets                paul@swi.com
 Paul D. Smith          psmith@BayNetworks.COM
 Paul Eggert            eggert@twinsun.com

diff --git a/tests/make.test b/tests/make.test
index 6cd372d9727d08b20be2e213d1add528134ddeb6..310cb176e1e12b63d94b3ec4af10496fb9a975b4 100755 (executable)
--- a/tests/make.test
+++ b/tests/make.test
@@ -27,18 +27,18 @@ export AUTOCONF
 export AUTOMAKE
 
 # Do the test twice -- once with make and once with make -w.
-# This tests for a bug reported by Rainer Orth.
+# This tests for a bug reported by Rainer Orth (see PR 175).
 
 save="$MAKE"
 for flag in '' -w; do
    MAKE="$save $flag" ./configure
 
-   fgrep 'am__include = #' Makefile && exit 1
+   fgrep 'am__include = include' Makefile
 
    touch configure.in
    $MAKE $flag
 
-   fgrep 'am__include = #' Makefile && exit 1
+   fgrep 'am__include = include' Makefile
 
    rm -f config.cache
 done