configure: fixed qconfig.h symlink warnings
authorRohan McGovern <rohan.mcgovern@nokia.com>
Tue, 28 Feb 2012 05:02:01 +0000 (15:02 +1000)
committerQt by Nokia <qt-info@nokia.com>
Tue, 28 Feb 2012 11:07:28 +0000 (12:07 +0100)
configure was unconditionally attempting to create two symlinks to
qconfig.h: include/Qt/qconfig.h, and include/QtCore/qconfig.h.

include/Qt doesn't exist any more, so this would always cause a
"No such file or directory" warning.  Remove that one.

include/QtCore/qconfig.h is usually created by syncqt now, so this would
cause a "File exists" warning.  Make that one conditional.

Change-Id: I8c6244dcbcf9765444f0d5c40c91a0ca192ecbcb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
configure

index 3d5f262..8b8fc7d 100755 (executable)
--- a/configure
+++ b/configure
@@ -6757,9 +6757,9 @@ else
     [ -f "$outpath/src/corelib/global/qconfig.h" ] && chmod +w "$outpath/src/corelib/global/qconfig.h"
     mv "$outpath/src/corelib/global/qconfig.h.new" "$outpath/src/corelib/global/qconfig.h"
     chmod -w "$outpath/src/corelib/global/qconfig.h"
-    for conf in "$outpath/include/QtCore/qconfig.h" "$outpath/include/Qt/qconfig.h"; do
-        ln -s "$outpath/src/corelib/global/qconfig.h" "$conf"
-    done
+    if [ ! -f "$outpath/include/QtCore/qconfig.h" ]; then
+        ln -s "$outpath/src/corelib/global/qconfig.h" "$outpath/include/QtCore/qconfig.h"
+    fi
 fi
 
 #-------------------------------------------------------------------------------