Commit b27212b6 authored by rtoy's avatar rtoy
Browse files

"which gmake" returns values that confuses the script for some

versions of which.  Some versions of which will return a 0 exit code
and return "no gmake in <paths>".  This confuses the script.  Check
for this and set MAKE to "make" in this case, and hope for the best.
parent d88bcbc7
...@@ -41,7 +41,10 @@ EOF ...@@ -41,7 +41,10 @@ EOF
if [ "$MAKE" = "" ] if [ "$MAKE" = "" ]
then then
MAKE="`which gmake`" || MAKE="`which make`" MAKE="`which gmake`"
if echo $MAKE | grep '^no' > /dev/null; then
MAKE="make"
fi
fi fi
export MAKE export MAKE
......
...@@ -48,7 +48,10 @@ SKIPUTILS=no ...@@ -48,7 +48,10 @@ SKIPUTILS=no
# If gmake exists, assume it is GNU make and use it. # If gmake exists, assume it is GNU make and use it.
if [ -z "$MAKE" ]; then if [ -z "$MAKE" ]; then
MAKE="`which gmake`" || MAKE="make" MAKE="`which gmake`"
if echo $MAKE | grep '^no' > /dev/null; then
MAKE="make"
fi
fi fi
usage () usage ()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment