Fix Savannah patch #7971.
* configure: Handle MAKE environment variable also.
diff --git a/ChangeLog b/ChangeLog
index 6f16fc3..516b378 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-03-21 Werner Lemberg <wl@gnu.org>
+
+ Fix Savannah patch #7971.
+
+ * configure: Handle MAKE environment variable also.
+
2013-03-17 Werner Lemberg <wl@gnu.org>
Fix Savannah bug #38538.
diff --git a/configure b/configure
index 55a24fd..aa3956f 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010 by
+# Copyright 2002-2006, 2008-2010, 2013 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -15,17 +15,22 @@
rm -f config.mk builds/unix/unix-def.mk builds/unix/unix-cc.mk
+# respect GNUMAKE environment variable for backwards compatibility
if test "x$GNUMAKE" = x; then
- GNUMAKE=make
+ if test "x$MAKE" = x; then
+ MAKE=make
+ fi
+else
+ MAKE=$GNUMAKE
fi
-if test -z "`$GNUMAKE -v 2>/dev/null | grep GNU`"; then
- if test -z "`$GNUMAKE -v 2>/dev/null | grep makepp`"; then
+if test -z "`$MAKE -v 2>/dev/null | grep GNU`"; then
+ if test -z "`$MAKE -v 2>/dev/null | grep makepp`"; then
echo "GNU make (>= 3.80) or makepp (>= 1.19) is required to build FreeType2." >&2
echo "Please try" >&2
- echo " \`GNUMAKE=<GNU make command name> $0'." >&2
+ echo " \`MAKE=<GNU make command name> $0'." >&2
echo "or >&2"
- echo " \`GNUMAKE=\"makepp --norc-substitution\" $0'." >&2
+ echo " \`MAKE=\"makepp --norc-substitution\" $0'." >&2
exit 1
fi
fi
@@ -120,6 +125,6 @@
esac
done ;;
esac
-CFG=$CFG $GNUMAKE setup unix
+CFG=$CFG $MAKE setup unix
# eof
diff --git a/docs/CHANGES b/docs/CHANGES
index 77df589..33a12ba 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -9,6 +9,13 @@
still using this macro.
+ II. MISCELLANEOUS
+
+ - The (top-level) `configure' script now respects the MAKE
+ environment variable to specify a `make' binary. For backwards
+ compatibility, GNUMAKE still overrides MAKE, though.
+
+
======================================================================
CHANGES BETWEEN 2.4.10 and 2.4.11
@@ -3726,7 +3733,7 @@
------------------------------------------------------------------------
-Copyright 2000-2012 by
+Copyright 2000-2013 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used,
diff --git a/docs/INSTALL.UNIX b/docs/INSTALL.UNIX
index 5dc0764..7175ca0 100644
--- a/docs/INSTALL.UNIX
+++ b/docs/INSTALL.UNIX
@@ -23,7 +23,7 @@
fail.
It is also fine to have GNU Make under another name (e.g. 'gmake')
- if you use the GNUMAKE variable as described below.
+ if you use the MAKE variable as described below.
As a special exception, 'makepp' can also be used to build
FreeType 2. See the file docs/MAKEPP for details.
@@ -61,11 +61,11 @@
./configure --prefix=/usr
- When using a different command to invoke GNU Make, use the GNUMAKE
+ When using a different command to invoke GNU Make, use the MAKE
variable. For example, if `gmake' is the command to use on your
system, do something like:
- GNUMAKE=gmake ./configure [options]
+ MAKE=gmake ./configure [options]
gmake
gmake install (as root)
@@ -83,7 +83,7 @@
----------------------------------------------------------------------
-Copyright 2003, 2004, 2005, 2006, 2007 by
+Copyright 2003-2007, 2013 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used,