From: vsr <vsr@opencascade.com>
Date: Mon, 16 Dec 2013 07:09:06 +0000 (+0000)
Subject: SALOME 7.3.0 preparation
X-Git-Tag: V7_3_0rc1~12
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8481b2e87c4af202f750af8fc1bb1002819cc128;p=tools%2Finstall.git

SALOME 7.3.0 preparation
---

diff --git a/config_files/libBatch.sh b/config_files/libBatch.sh
index fb4e533..cbda4ae 100755
--- a/config_files/libBatch.sh
+++ b/config_files/libBatch.sh
@@ -99,6 +99,8 @@ test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
 check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
 
+modif_cfg_file ${PRODUCT_DIR}/share/cmake/libbatch/LibBatchConfig.cmake
+
 # to generate environment scripts
 try_preinstalled
 }
diff --git a/config_files/numpy.sh b/config_files/numpy.sh
index bf6b28b..363d0f5 100755
--- a/config_files/numpy.sh
+++ b/config_files/numpy.sh
@@ -130,7 +130,7 @@ check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
 cd ${PRODUCT_DIR}/lib/pkgconfig
 for l in X `find . -name "*.pc"`; do
     if [ "${l}" != "X" ] ; then
-        sed -i "s%^prefix=.*%prefix=${PRODUCT_DIR}%g;s%prefix=.*%libdir=${PRODUCT_DIR}/lib%g" ${l}
+        sed -i "s%^prefix=.*%prefix=${PRODUCT_DIR}%g;s%libdir=.*%libdir=${PRODUCT_DIR}/lib%g" ${l}
 	sed -i "s%Libs: -L[^[:space:]]*/lib%Libs: -L${PRODUCT_DIR}/lib%g" ${l}
     fi
 done
diff --git a/config_files/qt.sh b/config_files/qt.sh
index 472c9e7..6d85817 100755
--- a/config_files/qt.sh
+++ b/config_files/qt.sh
@@ -166,7 +166,7 @@ for l in X `find ${PRODUCT_DIR}/lib/pkgconfig -name "*.pc"` ; do
 done
 
 # - modify qt prl files
-for l in X `find ${PRODUCT_DIR}/lib -name "*.prl"` ; do
+for l in X `find ${PRODUCT_DIR} -name "*.prl"` ; do
     if [ "${l}" != "X" ] ; then
         sed -i "s%[[:space:]]\(-L\)\?[^[:space:]]*qt-${VERSION_QT}% \1${PRODUCT_DIR}%g;s%[[:space:]]\(-L\)\?[^[:space:]]*qt-x11-opensource-src-${VERSION_QT}% \1${PRODUCT_DIR}%g" ${l}
     fi
diff --git a/config_files/simanio.sh b/config_files/simanio.sh
index 44787c4..3c313eb 100755
--- a/config_files/simanio.sh
+++ b/config_files/simanio.sh
@@ -118,6 +118,9 @@ test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
 check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
 
+modif_cfg_file ${PRODUCT_DIR}/share/cmake/simanio/SimanIOConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/share/cmake/simanio/SimanIOTargets-release.cmake 
+
 # to generate environment scripts
 try_preinstalled
 }