Mercurial > gnulib
changeset 39960:2f6689935242
gnu-make: Fix for NetBSD 8 'make'.
Reported by Reuben Thomas in
<https://lists.gnu.org/archive/html/bug-gnulib/2018-10/msg00135.html>.
* m4/gnu-make.m4 (gl_GNU_MAKE): Use a heuristic based on the --version
output, ignoring exit codes.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Tue, 30 Oct 2018 12:56:42 +0100 |
| parents | 2dc9b14f6416 |
| children | 4a9dba57ac9e |
| files | ChangeLog m4/gnu-make.m4 |
| diffstat | 2 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Oct 28 13:06:30 2018 +0100 +++ b/ChangeLog Tue Oct 30 12:56:42 2018 +0100 @@ -1,3 +1,11 @@ +2018-10-30 Bruno Haible <bruno@clisp.org> + + gnu-make: Fix for NetBSD 8 'make'. + Reported by Reuben Thomas in + <https://lists.gnu.org/archive/html/bug-gnulib/2018-10/msg00135.html>. + * m4/gnu-make.m4 (gl_GNU_MAKE): Use a heuristic based on the --version + output, ignoring exit codes. + 2018-10-28 Bernhard Voelker <mail@bernhard-voelker.de> maintainer-makefile: fix syntax-check rule for "same.h"
--- a/m4/gnu-make.m4 Sun Oct 28 13:06:30 2018 +0100 +++ b/m4/gnu-make.m4 Tue Oct 30 12:56:42 2018 +0100 @@ -10,10 +10,8 @@ # Set GNU_MAKE if we are using a recent-enough version of GNU make. -# Use --version AND trailing junk, because SGI Make doesn't fail on --version. - AC_DEFUN([gl_GNU_MAKE], [ AM_CONDITIONAL([GNU_MAKE], - [${MAKE-make} --version /cannot/make/this >/dev/null 2>&1]) + [LC_ALL=C ${MAKE-make} --version 2>/dev/null | sed -e '2,$d' | grep GNU >/dev/null]) ])