SALOME 7.3.0 preparation

diff --git a/config_files/libBatch.sh b/config_files/libBatch.sh
index fb4e5332f5fb1d5447d5f2adbc14131d778a846c..cbda4ae1bf9f29817d108c5c9341a71b174a12e0 100755 (executable)
--- 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 bf6b28b3afce6aac5b34d69358cfa4e23cf8e98b..363d0f5d1a8eae3d936b2a323a25d7d4c4dfb894 100755 (executable)
--- 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 472c9e7231c42b8828ff6b7ac95559d662cbd8b9..6d858177b7638c7cd954cedea6fa1311551587b0 100755 (executable)
--- 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 44787c456d98f8c3838d57b44df1ee027fc5be54..3c313eb224595d60b72ae9cba216902f622a58b2 100755 (executable)
--- 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
 }