diff options
| author | Mojca Miklavec <mojca.miklavec@gmail.com> | 2013-03-31 10:41:13 +0000 |
|---|---|---|
| committer | Mojca Miklavec <mojca.miklavec@gmail.com> | 2013-03-31 10:41:13 +0000 |
| commit | 212e9d9b59c85b5227bdc338d8c84af4e61db334 (patch) | |
| tree | d1fa6426aafc3f14f0b849115fcd778d57792de1 /Build/source | |
| parent | bd6366ad92a892b50d93a1ba4e3354b490502edd (diff) | |
libs/freetype2: Update another patch from git repository
configure: Use egrep, not grep.
git-svn-id: svn://tug.org/texlive/trunk@29566 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
3 files changed, 8 insertions, 4 deletions
diff --git a/Build/source/libs/freetype2/freetype-2.4.11-PATCHES/ChangeLog b/Build/source/libs/freetype2/freetype-2.4.11-PATCHES/ChangeLog index 8e988ebabda..365b353ae0c 100644 --- a/Build/source/libs/freetype2/freetype-2.4.11-PATCHES/ChangeLog +++ b/Build/source/libs/freetype2/freetype-2.4.11-PATCHES/ChangeLog @@ -1,3 +1,7 @@ +2013-03-31 Mojca Miklavec <mojca.miklavec.lists@gmail.com> + + * patch-03-RESPECT-MAKE: Another update from git repository. + 2013-03-22 Peter Breitenlohner <peb@mppmu.mpg.de> * patch-03-RESPECT-MAKE: Update from git repository. 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 index 662009ef3da..d750630e044 100644 --- 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 @@ -17,7 +17,7 @@ diff -ur -x config.guess -x config.sub -x install-sh freetype-2.4.11.orig/config if test "x$GNUMAKE" = x; then - GNUMAKE=make + if test "x$MAKE" = x; then -+ if test "x`make -v 2>/dev/null | grep '\(GNU\|makepp\)'`" = x; then ++ if test "x`make -v 2>/dev/null | egrep 'GNU|makepp'`" = x; then + MAKE=gmake + else + MAKE=make @@ -36,7 +36,7 @@ diff -ur -x config.guess -x config.sub -x install-sh freetype-2.4.11.orig/config - echo " \`GNUMAKE=\"makepp --norc-substitution\" $0'." >&2 - exit 1 - fi -+if test "x`$MAKE -v 2>/dev/null | grep '\(GNU\|makepp\)'`" = x; then ++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 diff --git a/Build/source/libs/freetype2/freetype-2.4.11/configure b/Build/source/libs/freetype2/freetype-2.4.11/configure index b0c6d538426..4d8a945a5a9 100755 --- a/Build/source/libs/freetype2/freetype-2.4.11/configure +++ b/Build/source/libs/freetype2/freetype-2.4.11/configure @@ -18,7 +18,7 @@ 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 if test "x$MAKE" = x; then - if test "x`make -v 2>/dev/null | grep '\(GNU\|makepp\)'`" = x; then + if test "x`make -v 2>/dev/null | egrep 'GNU|makepp'`" = x; then MAKE=gmake else MAKE=make @@ -28,7 +28,7 @@ else MAKE=$GNUMAKE fi -if test "x`$MAKE -v 2>/dev/null | grep '\(GNU\|makepp\)'`" = x; then +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 |