diff options
Diffstat (limited to 'Build/source/libs/freetype2/freetype-2.4.11-PATCHES/patch-03-RESPECT-MAKE')
-rw-r--r-- | Build/source/libs/freetype2/freetype-2.4.11-PATCHES/patch-03-RESPECT-MAKE | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/Build/source/libs/freetype2/freetype-2.4.11-PATCHES/patch-03-RESPECT-MAKE b/Build/source/libs/freetype2/freetype-2.4.11-PATCHES/patch-03-RESPECT-MAKE deleted file mode 100644 index d750630e044..00000000000 --- a/Build/source/libs/freetype2/freetype-2.4.11-PATCHES/patch-03-RESPECT-MAKE +++ /dev/null @@ -1,59 +0,0 @@ -diff -ur -x config.guess -x config.sub -x install-sh freetype-2.4.11.orig/configure freetype-2.4.11/configure ---- freetype-2.4.11.orig/configure 2011-12-02 20:21:55.000000000 +0100 -+++ freetype-2.4.11/configure 2013-03-22 08:31:44.000000000 +0100 -@@ -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,19 +15,29 @@ - - 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 -+ if test "x`make -v 2>/dev/null | egrep 'GNU|makepp'`" = x; then -+ MAKE=gmake -+ else -+ MAKE=make -+ fi -+ 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 -- 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 "or >&2" -- echo " \`GNUMAKE=\"makepp --norc-substitution\" $0'." >&2 -- exit 1 -- fi -+if test "x`$MAKE -v 2>/dev/null | egrep 'GNU|makepp'`" = x; then -+ echo "GNU make (>= 3.80) or makepp (>= 1.19) is required to build FreeType2." >&2 -+ echo "Please try" >&2 -+ echo >&2 -+ echo " MAKE=<GNU make command name> $0" >&2 -+ echo >&2 -+ echo "or" >&2 -+ echo >&2 -+ echo " MAKE=\"makepp --norc-substitution\" $0" >&2 -+ exit 1 - fi - - # Get `dirname' functionality. This is taken and adapted from autoconf's -@@ -120,6 +130,6 @@ - esac - done ;; - esac --CFG=$CFG $GNUMAKE setup unix -+CFG=$CFG $MAKE setup unix - - # eof |