diff options
| author | Harald Fernengel <harald@trolltech.com> | 2009-08-11 12:42:53 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald@trolltech.com> | 2009-08-11 12:45:33 (GMT) |
| commit | bead88ed4149202638167499e50148ae9fb7ab3e (patch) | |
| tree | f5a020f538a97c3b7373fdb78c9a8f36ccd00726 /config.tests/unix/compile.test | |
| parent | e08c698d48a3179515e0392843c77efcac892134 (diff) | |
| download | Qt-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>
Diffstat (limited to 'config.tests/unix/compile.test')
| -rwxr-xr-x | config.tests/unix/compile.test | 6 |
1 files changed, 3 insertions, 3 deletions
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 |