SALOME 6.5.0 preparation: correct environment for MED: replace MED2HOME by MED3HOME

diff --git a/config_files/common.sh b/config_files/common.sh
index f02bed4f3eba62b93f6dae66e22a0b44e90926f1..d8eafacb53d3e1c11e7b9baa8ac1b33f84900569 100755 (executable)
--- a/config_files/common.sh
+++ b/config_files/common.sh
@@ -800,9 +800,9 @@ if [ "$l" != "X" ] ; then
     fi
 
     # . process MED dependencies
-    meddir=`printenv MED2HOME`/lib
-    if [ -n "${MED2HOME}" ] && [ -d "${meddir}" ] ; then
-       # echo $l $MED2HOME $meddir
+    meddir=`printenv MED3HOME`/lib
+    if [ -n "${MED3HOME}" ] && [ -d "${meddir}" ] ; then
+       # echo $l $MED3HOME $meddir
        sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*med[^[:space:]/]*/lib% \1${meddir}%g" $l > $l"_"
        mv -f $l"_" $l
     fi

diff --git a/config_files/med.sh b/config_files/med.sh
index ef5bd0ac32a3b1a55715cd5f663839071c39c5ae..b816e264cd1a332f139113cd7caa525ff3521fc6 100755 (executable)
--- a/config_files/med.sh
+++ b/config_files/med.sh
@@ -19,11 +19,11 @@ MED_VERSION=3.0.5
 
 check_version()
 {
-if [ -z "$MED2HOME" ]; then
-   #echo "MED2HOME doesn't set"
+if [ -z "$MED3HOME" ]; then
+   #echo "MED3HOME doesn't set"
    return 1
 fi
-check_lib_version libmed.so.1.1.2 ${MED2HOME}/lib
+check_lib_version libmed.so.1.1.2 ${MED3HOME}/lib
 if [ "$?" -eq "0" ]; then
    #echo "The product ${PRODUCT} has been already installed on yours system"
    return 0
@@ -35,9 +35,9 @@ print_env_bin()
 {
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
-export MED2HOME=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export PATH=\${MED2HOME}/bin:\${PATH}
-export LD_LIBRARY_PATH=\${MED2HOME}/lib:\${LD_LIBRARY_PATH}
+export MED3HOME=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PATH=\${MED3HOME}/bin:\${PATH}
+export LD_LIBRARY_PATH=\${MED3HOME}/lib:\${LD_LIBRARY_PATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})