AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't blow away mkspecs/modules-inst when reconfiguring

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2012-07-03 19:32:42 +02:00 committed by Qt by Nokia
parent 918fd56324
commit 88c41f8439
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure vendored
View File

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