Fix problem with compilation of CASCADE on Mandrake 10.1 : force search for DPS packa...

[tools/install.git] / config_files / SUPERV_BIN.sh

diff --git a/config_files/SUPERV_BIN.sh b/config_files/SUPERV_BIN.sh
index 799c016653b64fa7f814207f849e9af9487200ea..0c9bbb1425011e815e56fd66ac695296feafa822 100755 (executable)
--- a/config_files/SUPERV_BIN.sh
+++ b/config_files/SUPERV_BIN.sh
@@ -5,7 +5,7 @@ if [ -n "${SUPERV_ROOT_DIR=}" ]; then
     check_lib_version VERSION ${SUPERV_ROOT_DIR}/bin/salome
     if [ "$?" -eq "0" ]; then
        ver=`cat ${SUPERV_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
-       if [ "$ver" = "3.1.0a3" ]; then
+       if [ "$ver" = "3.1.0" ]; then
            return 0
        fi
     fi
@@ -67,9 +67,10 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/SUPERVbinariesV3.1.0a3.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/SUPERVbinariesV3.1.0.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
+export SUPERV_ROOT_DIR=${PRODUCT_DIR}
 modif_la_files ${PRODUCT_DIR}/lib/salome
 
 print_env
@@ -81,7 +82,7 @@ export SOURCE_DIR=$3;
 export INSTALL_ROOT=$4;
 export PRODUCT_SEQUENCE=$5;
 if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="SupervBin" ; fi
-export PRODUCT="SUPERV_3.1.0a3"
+export PRODUCT="SUPERV_3.1.0"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh