AuroraMiddleware/freetype
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Savannah patch #7971.

Browse Source 
* configure: Handle MAKE environment variable also.
This commit is contained in:
Werner Lemberg 2013-03-21 09:00:27 +01:00
parent b114b7c01b
commit 6f1e345d35
4 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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.

19
configure vendored
View File

@ -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 @@ case $# in
esac
done ;;
esac
CFG=$CFG $GNUMAKE setup unix
CFG=$CFG $MAKE setup unix
# eof

9
docs/CHANGES
View File

@ -9,6 +9,13 @@ CHANGES BETWEEN 2.4.11 and 2.4.12
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 @@ Extensions support:
------------------------------------------------------------------------
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,

8
docs/INSTALL.UNIX
View File

@ -23,7 +23,7 @@ or MSys on Win32:
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 @@ or MSys on Win32:
./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 @@ or MSys on Win32:
----------------------------------------------------------------------
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,