summaryrefslogtreecommitdiffstats
path: root/config.tests/unix
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-06-23 16:29:03 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-06-23 16:50:15 (GMT)
commit1dda8ac032d279f066bea6d0efaf6e4165d4dac5 (patch)
treee67d039f070ec7cd1aad7adce3e8b5ea43741420 /config.tests/unix
parent545809b2de8d87922588cf2eed8e5b7952ee988b (diff)
downloadQt-1dda8ac032d279f066bea6d0efaf6e4165d4dac5.zip
Qt-1dda8ac032d279f066bea6d0efaf6e4165d4dac5.tar.gz
Qt-1dda8ac032d279f066bea6d0efaf6e4165d4dac5.tar.bz2
Avoid running "make distclean" before there's a Makefile in the test dir.
I have been bitten by this quite often and I had never found out why suddenly configure decided to erase all my build. It happens that my "make" replacement script command tries to search for a Makefile in the parent dirs (so I can run "make" while inside src/corelib/tools), and this caused the whole build to be erased. Reviewed-by: Trust Me
Diffstat (limited to 'config.tests/unix')
-rwxr-xr-xconfig.tests/unix/compile.test3
1 files changed, 2 insertions, 1 deletions
diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test
index ff51c91..0e73852 100755
--- a/config.tests/unix/compile.test
+++ b/config.tests/unix/compile.test
@@ -59,7 +59,8 @@ test -d "$OUTDIR/$TEST" || mkdir -p "$OUTDIR/$TEST"
cd "$OUTDIR/$TEST"
-make distclean >/dev/null 2>&1
+test -e 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