* tests/defs.in (GNUmake): Grep for GNU to parry FreeBSD make.

Report from Mark D. Baushke.

diff --git a/ChangeLog b/ChangeLog
index 8828d17fc1f3b354588a578ff6707d64076f67cb..b552b017c1fb2ece7cce6a5464df15479906609c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-10  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * tests/defs.in (GNUmake): Grep for GNU to parry FreeBSD make.
+       Report from Mark D. Baushke.
+
 2004-04-25  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * lib/texinfo.tex: New upstream version.

diff --git a/THANKS b/THANKS
index a6c02c1e62726f3c6cfb899079cb001ec1bb1787..bd427043d32745fa4c99f26218350b330f28f186 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -139,6 +139,7 @@ Manu Rouat          emmanuel.rouat@wanadoo.fr
 Marcus Brinkmann       Marcus.Brinkmann@ruhr-uni-bochum.de
 Marcus G. Daniels      mgd@ute.santafe.edu
 Marius Vollmer         mvo@zagadka.ping.de
+Mark D. Baushke                mdb@cvshome.org
 Mark Eichin            eichin@cygnus.com
 Mark Elbrecht          snowball3@bigfoot.com
 Mark Galassi           rosalia@nis.lanl.gov

diff --git a/tests/defs.in b/tests/defs.in
index 5fdf1c195ef832ae0415b81744e6b702c2e94b6b..b7b23ac633a23359e9c261b370bfcfaed089ddc9 100644 (file)
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -113,9 +113,11 @@ then
        ( etags --version -o /dev/null ) || exit 77
        ;;
       GNUmake)
-       # Use --version and -v, because SGI Make doesn't fail on --version.
-       echo "$me: running $MAKE --version -v"
-       ( $MAKE --version -v ) || exit 77
+       # Use --version AND -v, because SGI Make doesn't fail on --version.
+       # Also grep for GNU because newer versions of FreeBSD make do
+       # not complain about `--version' (they seem to silently ignore it).
+       echo "$me: running $MAKE --version -v | grep GNU"
+       ( $MAKE --version -v | grep GNU ) || exit 77
        ;;
       gcc)
         # When gcc is required, export `CC=gcc' so that ./configure