From: Thiago Macieira <thiago.macieira@intel.com>
Date: Mon, 26 Mar 2012 19:11:30 +0000 (-0300)
Subject: Stop erasing mkspecs/modules at every reconfigure.
X-Git-Tag: qt-v5.0.0-alpha1~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5e4ed93b1c0dac4916e5544fb613d5f1451aa155;p=profile%2Fivi%2Fqtbase.git

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>
---

diff --git a/configure b/configure
index c437bb1..d1040ba 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"