From 27a978517a1ea171e4bcd759d3cd28fac3a34518 Mon Sep 17 00:00:00 2001 From: inv Date: Tue, 24 Apr 2012 12:49:04 +0000 Subject: [PATCH] SALOME 6.5.0 preparation: correct environment for MED: replace MED2HOME by MED3HOME --- config_files/common.sh | 6 +++--- config_files/med.sh | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/config_files/common.sh b/config_files/common.sh index f02bed4..d8eafac 100755 --- 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 ef5bd0a..b816e26 100755 --- 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 <