SALOME 6.5.0 preparation: update script for Qt

diff --git a/config_files/qt.sh b/config_files/qt.sh
index c511ae68788db861848e12304b4137e255f9b371..5d6d0e56201e5c3778e5a968205cfeeb049f0afc 100755 (executable)
--- a/config_files/qt.sh
+++ b/config_files/qt.sh
@@ -89,7 +89,7 @@ check_job ${PRODUCT_DIR}/MAKE.LOG make
 check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
 
 if test `uname -m` = "x86_64" ; then
-    cd ${PRODUCT_DIR}; ln -sf lib lib64
+    ( cd ${PRODUCT_DIR} && ln -sf lib lib64 )
 fi
 
 cd ${PRODUCT_DIR};
@@ -118,13 +118,9 @@ cd ${PRODUCT_DIR}/lib
 
 # modify qt la files
 for l in `find $ldir -name "*.la"`; do
-sed -e "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" $l > $l"_"
-chmod -f --reference=$l $l"_" ; mv -f $l"_" $l
-sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*${PRODUCT}% \1${PRODUCT_DIR}%g" $l > $l"_"
-chmod -f --reference=$l $l"_" ; mv -f $l"_" $l
-sed -e "s%^dependency_libs='\(-L\)\?[^[:space:]]*${PRODUCT}%dependency_libs=\'\1${PRODUCT_DIR}%g" $l > $l"_"
-chmod -f --reference=$l $l"_" ; mv -f $l"_" $l
-
+    sed -i "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" $l
+    sed -i "s%[[:space:]]\(-L\)\?[^[:space:]]*${PRODUCT}% \1${PRODUCT_DIR}%g" $l
+    sed -i "s%^dependency_libs='\(-L\)\?[^[:space:]]*${PRODUCT}%dependency_libs=\'\1${PRODUCT_DIR}%g" $l
 done
 
 # modify libGL.so flags
@@ -141,13 +137,13 @@ fi
 cd ${PRODUCT_DIR}/lib/pkgconfig
 for l in X `find . -name "*.pc"`; do
     if [ "${l}" != "X" ] ; then
-       sed -e "s%^prefix=\(.*\)%prefix=${PRODUCT_DIR}%g" \
-           -e "s%[[:space:]]\(-L\)\?[^[:space:]]*qt-${QT_REF_VERSION}% \1${PRODUCT_DIR}%g" \
-           -e "s%[[:space:]]\(-L\)\?[^[:space:]]*qt-x11-opensource-src-${QT_REF_VERSION}% \1${PRODUCT_DIR}%g" \
-           -e "s%moc_location=.*%moc_location=${PRODUCT_DIR}/bin/moc%g" \
-           -e "s%uic_location=.*%uic_location=${PRODUCT_DIR}/bin/uic%g" \
-           ${l} > ${l}_
-       chmod -f --reference=${l} ${l}_ ; mv -f ${l}_ ${l}
+        sed -e "s%^prefix=\(.*\)%prefix=${PRODUCT_DIR}%g" \
+            -e "s%[[:space:]]\(-L\)\?[^[:space:]]*qt-${QT_REF_VERSION}% \1${PRODUCT_DIR}%g" \
+            -e "s%[[:space:]]\(-L\)\?[^[:space:]]*qt-x11-opensource-src-${QT_REF_VERSION}% \1${PRODUCT_DIR}%g" \
+            -e "s%moc_location=.*%moc_location=${PRODUCT_DIR}/bin/moc%g" \
+            -e "s%uic_location=.*%uic_location=${PRODUCT_DIR}/bin/uic%g" \
+            ${l} > ${l}_
+        chmod -f --reference=${l} ${l}_ ; mv -f ${l}_ ${l}
     fi
 done