summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Fernengel <harald@trolltech.com>2009-08-11 12:42:53 (GMT)
committerHarald Fernengel <harald@trolltech.com>2009-08-11 12:45:33 (GMT)
commitbead88ed4149202638167499e50148ae9fb7ab3e (patch)
treef5a020f538a97c3b7373fdb78c9a8f36ccd00726
parente08c698d48a3179515e0392843c77efcac892134 (diff)
downloadQt-bead88ed4149202638167499e50148ae9fb7ab3e.zip
Qt-bead88ed4149202638167499e50148ae9fb7ab3e.tar.gz
Qt-bead88ed4149202638167499e50148ae9fb7ab3e.tar.bz2
Allow make utilities other than "make"
Instead of hard coding "make", use "$MAKE". If $MAKE is not set, configure will export it for us when searching for "make". Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
-rwxr-xr-xconfig.tests/mac/crc.test6
-rwxr-xr-xconfig.tests/unix/compile.test6
-rwxr-xr-xconfig.tests/unix/doubleformat.test2
-rwxr-xr-xconfig.tests/unix/endian.test4
-rwxr-xr-xconfig.tests/unix/ptrsize.test4
-rwxr-xr-xconfig.tests/x11/notype.test4
-rwxr-xr-xconfigure2
7 files changed, 15 insertions, 13 deletions
diff --git a/config.tests/mac/crc.test b/config.tests/mac/crc.test
index 1a16204..644ff75 100755
--- a/config.tests/mac/crc.test
+++ b/config.tests/mac/crc.test
@@ -52,13 +52,13 @@ test -d "$OUTDIR/$TEST" || mkdir -p "$OUTDIR/$TEST"
cd "$OUTDIR/$TEST"
-make distclean >/dev/null 2>&1
+$MAKE distclean >/dev/null 2>&1
"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
if [ "$VERBOSE" = "yes" ]; then
- make
+ $MAKE
else
- make >/dev/null 2>&1
+ $MAKE >/dev/null 2>&1
fi
diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test
index 550890f..67a4636 100755
--- a/config.tests/unix/compile.test
+++ b/config.tests/unix/compile.test
@@ -64,14 +64,14 @@ test -d "$OUTDIR/$TEST" || mkdir -p "$OUTDIR/$TEST"
cd "$OUTDIR/$TEST"
-test -r Makefile && make distclean >/dev/null 2>&1
+test -r Makefile && $MAKE distclean >/dev/null 2>&1
"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
if [ "$VERBOSE" = "yes" ]; then
- make
+ $MAKE
else
- make >/dev/null 2>&1
+ $MAKE >/dev/null 2>&1
fi
[ -x "$EXE" ] && SUCCESS=yes
diff --git a/config.tests/unix/doubleformat.test b/config.tests/unix/doubleformat.test
index 3e707c5..953efd8 100755
--- a/config.tests/unix/doubleformat.test
+++ b/config.tests/unix/doubleformat.test
@@ -14,7 +14,7 @@ test -d "$OUTDIR/config.tests/unix/doubleformat" || mkdir -p "$OUTDIR/config.tes
cd "$OUTDIR/config.tests/unix/doubleformat"
DOUBLEFORMAT="UNKNOWN"
-[ "$VERBOSE" = "yes" ] && make || make >/dev/null 2>&1
+[ "$VERBOSE" = "yes" ] && $MAKE || $MAKE >/dev/null 2>&1
if [ -f ./doubleformattest ]; then
: # nop
diff --git a/config.tests/unix/endian.test b/config.tests/unix/endian.test
index 2c21652..4755b1f 100755
--- a/config.tests/unix/endian.test
+++ b/config.tests/unix/endian.test
@@ -15,7 +15,7 @@ cd "$OUTDIR/config.tests/unix/endian"
ENDIAN="UNKNOWN"
-[ "$VERBOSE" = "yes" ] && make || make >/dev/null 2>&1
+[ "$VERBOSE" = "yes" ] && $MAKE || $MAKE >/dev/null 2>&1
if [ -f ./endiantest.exe ]; then
binary=./endiantest.exe
@@ -40,7 +40,7 @@ elif strings $binary | grep MostSignificantByteFirst >/dev/null 2>&1; then
fi
# make clean as this tests is compiled for both the host and the target
-make distclean
+$MAKE distclean
# done
if [ "$ENDIAN" = "LITTLE" ]; then
diff --git a/config.tests/unix/ptrsize.test b/config.tests/unix/ptrsize.test
index 1307cec..c1d80ee 100755
--- a/config.tests/unix/ptrsize.test
+++ b/config.tests/unix/ptrsize.test
@@ -14,9 +14,9 @@ test -d "$OUTDIR/config.tests/unix/ptrsize" || mkdir -p "$OUTDIR/config.tests/un
cd "$OUTDIR/config.tests/unix/ptrsize"
if [ "$VERBOSE" = "yes" ]; then
- (make clean && make)
+ ($MAKE clean && $MAKE)
else
- (make clean && make) >/dev/null 2>&1
+ ($MAKE clean && $MAKE) >/dev/null 2>&1
fi
RETVAL=$?
diff --git a/config.tests/x11/notype.test b/config.tests/x11/notype.test
index a522491..3a01d8f 100755
--- a/config.tests/x11/notype.test
+++ b/config.tests/x11/notype.test
@@ -31,9 +31,9 @@ if [ $XPLATFORM = "solaris-g++" -o $XPLATFORM = "hpux-g++" -o $XPLATFORM = "aix-
cd "$OUTDIR/config.tests/x11/notype"
if [ "$VERBOSE" = "yes" ]; then
- make
+ $MAKE
else
- make >/dev/null 2>&1
+ $MAKE >/dev/null 2>&1
fi
[ -x notypetest ] && NOTYPE=no
diff --git a/configure b/configure
index cca6847..7b7cc1c 100755
--- a/configure
+++ b/configure
@@ -2200,6 +2200,8 @@ if [ -z "$MAKE" ]; then
echo >&2 "Cannot proceed."
exit 1
fi
+ # export MAKE, we need it later in the config.tests
+ export MAKE
fi
fi ### help