Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType
Commits:
-
5c37b640
by Alexei Podtelezhnikov at 2023-03-02T20:53:21+00:00
1 changed file:
Changes:
... | ... | @@ -15,19 +15,10 @@ |
15 | 15 | |
16 | 16 | rm -f config.mk builds/unix/unix-def.mk builds/unix/unix-cc.mk
|
17 | 17 | |
18 | -if test -z "$EGREP"; then
|
|
19 | - if echo a | grep -E '(a|b)' >/dev/null 2>&1; then
|
|
20 | - EGREP="grep -E"
|
|
21 | - else
|
|
22 | - # if grep -E doesn't work, assume egrep does.
|
|
23 | - EGREP=egrep
|
|
24 | - fi
|
|
25 | -fi
|
|
26 | - |
|
27 | 18 | # respect GNUMAKE environment variable for backward compatibility
|
28 | 19 | if test "x$GNUMAKE" = x; then
|
29 | 20 | if test "x$MAKE" = x; then
|
30 | - if test "x`make -v 2>/dev/null | $EGREP 'GNU|makepp'`" = x; then
|
|
21 | + if test "x`make -v 2>/dev/null | sed -n -e '/GNU/p' -e '/makepp/p'`" = x; then
|
|
31 | 22 | MAKE=gmake
|
32 | 23 | else
|
33 | 24 | MAKE=make
|
... | ... | @@ -37,7 +28,7 @@ else |
37 | 28 | MAKE=$GNUMAKE
|
38 | 29 | fi
|
39 | 30 | |
40 | -if test "x`$MAKE -v 2>/dev/null | $EGREP 'GNU|makepp'`" = x; then
|
|
31 | +if test "x`$MAKE -v 2>/dev/null | sed -n -e '/GNU/p' -e '/makepp/p'`" = x; then
|
|
41 | 32 | echo "GNU make (>= 3.81) or makepp (>= 2.0) is required to build FreeType2." >&2
|
42 | 33 | echo "Please try" >&2
|
43 | 34 | echo >&2
|