summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2012-03-26 16:11:30 -0300
committerQt by Nokia <qt-info@nokia.com>2012-03-27 21:14:35 +0200
commit5e4ed93b1c0dac4916e5544fb613d5f1451aa155 (patch)
tree9366e1c82376aa53cfb9b2ce000c2b5bd7c0206d
parente2dfd2f4d2ffb9238b3ccd3276c956c279e125f9 (diff)
Stop erasing mkspecs/modules at every reconfigure.
Developers who are building & rebuilding Qt often end up needing to recompile all other modules because of this removal even though the libs are still compatible. Change-Id: I4ec0e8ab222675dcd2a3f3a2b5e931c1c7f31f69 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
-rwxr-xr-xconfigure11
1 files changed, 10 insertions, 1 deletions
diff --git a/configure b/configure
index c437bb1dba..d1040ba510 100755
--- a/configure
+++ b/configure
@@ -2097,6 +2097,10 @@ if [ "$OPT_SHADOW" = "yes" ]; then
fi
done
+ # save a pre-existing mkspecs/modules dir
+ test -d "$outpath/mkspecs/modules" && \
+ mv "$outpath/mkspecs/modules" "$outpath/mkspecs-modules"
+
# symlink the mkspecs directory
mkdir -p "$outpath/mkspecs"
rm -rf "$outpath"/mkspecs/*
@@ -2116,7 +2120,12 @@ if [ "$OPT_SHADOW" = "yes" ]; then
ShadowMkspecs features
# The modules dir is special, too.
- ShadowMkspecs modules
+ if test -d "$outpath/mkspecs-modules"; then
+ rm -rf "$outpath/mkspecs/modules"
+ mv "$outpath/mkspecs-modules" "$outpath/mkspecs/modules"
+ else
+ ShadowMkspecs modules
+ fi
# symlink the doc directory
rm -rf "$outpath/doc"