From 457606d12b13025970af2e36c640bb1f1e8f89d6 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Tue, 28 Feb 2012 15:02:01 +1000 Subject: configure: fixed qconfig.h symlink warnings 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 --- configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 3d5f262cea..8b8fc7d008 100755 --- 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 #------------------------------------------------------------------------------- -- cgit v1.2.3