diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-07-03 19:32:42 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-05 21:11:47 +0200 |
| commit | 88c41f843953fb20a5716ee3ffd23e44a2a957b5 (patch) | |
| tree | 7c1fb465a6cdf85974b3039bb679bb061347eb91 | |
| parent | 918fd56324bbfb0d3e6bfffaaa608c64b62ef45b (diff) | |
don't blow away mkspecs/modules-inst when reconfiguring
otherwise we get lots of nasty warning messages about missing pri files.
it is arguable whether it is a good idea to do that, but we preserve
mkspecs/modules, too, and the previously built libraries don't just
vanish, either.
Change-Id: Ieded8d8858f1b0135bc3bea894b4a676024ac8ca
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| -rwxr-xr-x | configure | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -2125,6 +2125,9 @@ if [ "$OPT_SHADOW" = "yes" ]; then # save a pre-existing mkspecs/modules dir test -d "$outpath/mkspecs/modules" && \ mv "$outpath/mkspecs/modules" "$outpath/mkspecs-modules" + # ditto for mkspecs/modules-inst + test -d "$outpath/mkspecs/modules-inst" && \ + mv "$outpath/mkspecs/modules-inst" "$outpath/mkspecs-modules-inst" # symlink the mkspecs directory mkdir -p "$outpath/mkspecs" @@ -2152,6 +2155,12 @@ if [ "$OPT_SHADOW" = "yes" ]; then ShadowMkspecs modules fi + # The modules-inst dir is not quite as special, but still. + if test -d "$outpath/mkspecs-modules-inst"; then + rm -rf "$outpath/mkspecs/modules-inst" + mv "$outpath/mkspecs-modules-inst" "$outpath/mkspecs/modules-inst" + fi + # symlink the doc directory rm -rf "$outpath/doc" ln -s "$relpath/doc" "$outpath/doc" |