diff options
| author | Werner Lemberg <wl@gnu.org> | 2013-03-21 09:00:27 +0100 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2013-03-21 09:00:27 +0100 |
| commit | 6f1e345d35238775f421e57fb4980abe08fd4920 (patch) | |
| tree | 6971387f6426393d52cd9c06f3beec48225462fb /configure | |
| parent | b114b7c01ba59df532d7c7efe56ad073c527166f (diff) | |
| download | freetype2-6f1e345d35238775f421e57fb4980abe08fd4920.tar.gz | |
Fix Savannah patch #7971.
* configure: Handle MAKE environment variable also.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 19 |
1 files changed, 12 insertions, 7 deletions
@@ -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 |