aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreschnett <eschnett@ba58616d-3abc-4c77-8745-3ba8ad4a582f>2010-09-23 23:36:21 +0000
committereschnett <eschnett@ba58616d-3abc-4c77-8745-3ba8ad4a582f>2010-09-23 23:36:21 +0000
commit707c1b220d436c05e6197851cb42ed92dedf2f6c (patch)
tree65fad06f7fb3af5d2671227471bd978803230db9
parentd8354e1ded6a9213aa7504d16de43e3fe4011947 (diff)
Make build script more portable
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/libjpeg/trunk@3 ba58616d-3abc-4c77-8745-3ba8ad4a582f
-rwxr-xr-xlibjpeg.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/libjpeg.sh b/libjpeg.sh
index f3731e8..ab4b956 100755
--- a/libjpeg.sh
+++ b/libjpeg.sh
@@ -35,6 +35,9 @@ unset LIBS
else
echo "libjpeg: Building enclosed libjpeg library"
+ # Should we use gmake or make?
+ MAKE=$(gmake --help > /dev/null 2>&1 && echo gmake || echo make)
+
echo "libjpeg: Unpacking archive..."
rm -rf build-${NAME}
mkdir build-${NAME}
@@ -51,10 +54,10 @@ unset LIBS
./configure --prefix=${LIBJPEG_DIR}
echo "libjpeg: Building..."
- make
+ ${MAKE}
echo "libjpeg: Installing..."
- make install
+ ${MAKE} install
popd
echo 'done' > done-${NAME}