From c927df2dd533f4b57c357d2437d685251861caec Mon Sep 17 00:00:00 2001
From: maintenance team <salome-mnt@opencascade.com>
Date: Wed, 24 Jun 2009 09:03:19 +0000
Subject: [PATCH] Update for excluduing lib64

---
 config_files/BLSURFPLUGIN.sh   | 11 ++---------
 config_files/CALCULATOR.sh     | 13 ++-----------
 config_files/COMPONENT.sh      | 13 ++-----------
 config_files/FILTER.sh         | 11 ++---------
 config_files/GEOM.sh           | 11 ++---------
 config_files/GHS3DPLUGIN.sh    | 13 ++-----------
 config_files/GHS3DPRLPLUGIN.sh | 11 ++---------
 config_files/GUI.sh            | 11 ++---------
 config_files/HELLO.sh          | 11 ++---------
 config_files/HexoticPLUGIN.sh  | 11 ++---------
 config_files/KERNEL.sh         | 11 ++---------
 config_files/LIGHT.sh          |  9 +--------
 config_files/MED.sh            | 11 ++---------
 config_files/MULTIPR.sh        | 11 ++---------
 config_files/NETGENPLUGIN.sh   | 11 ++---------
 config_files/PYCALCULATOR.sh   | 11 ++---------
 config_files/PYHELLO.sh        |  9 +--------
 config_files/PYLIGHT.sh        |  9 +--------
 config_files/RANDOMIZER.sh     | 11 ++---------
 config_files/SIERPINSKY.sh     | 11 ++---------
 config_files/SMESH.sh          | 11 ++---------
 config_files/VISU.sh           | 11 ++---------
 config_files/YACS.sh           | 11 ++---------
 config_files/omniORB-4.1.3.sh  |  2 +-
 24 files changed, 44 insertions(+), 211 deletions(-)

diff --git a/config_files/BLSURFPLUGIN.sh b/config_files/BLSURFPLUGIN.sh
index 8fd5050..9306af0 100755
--- a/config_files/BLSURFPLUGIN.sh
+++ b/config_files/BLSURFPLUGIN.sh
@@ -31,21 +31,14 @@ return 1
 }
 
 print_env_bin(){
-if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
-    LIB_PREFIX=64
-elif [ -d ${PRODUCT_DIR}/lib ] ; then 
-    LIB_PREFIX=""
-else 
-    LIB_PREFIX=64
-fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export BLSURFPLUGIN_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
     export PATH=\${BLSURFPLUGIN_ROOT_DIR}/bin/salome:\${PATH}
-    export LD_LIBRARY_PATH=\${BLSURFPLUGIN_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH}
-    export PYTHONPATH=\${BLSURFPLUGIN_ROOT_DIR}/bin/salome:\${BLSURFPLUGIN_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+    export LD_LIBRARY_PATH=\${BLSURFPLUGIN_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${BLSURFPLUGIN_ROOT_DIR}/bin/salome:\${BLSURFPLUGIN_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
   fi
 fi
 ##
diff --git a/config_files/CALCULATOR.sh b/config_files/CALCULATOR.sh
index 24abaa5..0fa1fb1 100755
--- a/config_files/CALCULATOR.sh
+++ b/config_files/CALCULATOR.sh
@@ -30,23 +30,14 @@ return 1
 }
 
 print_env_bin(){
-
-if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
-    LIB_PREFIX=64
-elif [ -d ${PRODUCT_DIR}/lib ] ; then 
-    LIB_PREFIX=""
-else 
-    LIB_PREFIX=64
-fi
-
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export CALCULATOR_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
     export PATH=\${CALCULATOR_ROOT_DIR}/bin/salome:\${PATH}
-    export LD_LIBRARY_PATH=\${CALCULATOR_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH}
-    export PYTHONPATH=\${CALCULATOR_ROOT_DIR}/bin/salome:\${CALCULATOR_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${CALCULATOR_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+    export LD_LIBRARY_PATH=\${CALCULATOR_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${CALCULATOR_ROOT_DIR}/bin/salome:\${CALCULATOR_ROOT_DIR}/lib/salome:\${CALCULATOR_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
   fi
 fi
 ##
diff --git a/config_files/COMPONENT.sh b/config_files/COMPONENT.sh
index 12f4811..f134724 100755
--- a/config_files/COMPONENT.sh
+++ b/config_files/COMPONENT.sh
@@ -30,23 +30,14 @@ return 1
 }
 
 print_env_bin(){
-
-if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
-    LIB_PREFIX=64
-elif [ -d ${PRODUCT_DIR}/lib ] ; then 
-    LIB_PREFIX=""
-else 
-    LIB_PREFIX=64
-fi
-
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export COMPONENT_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
     export PATH=\${COMPONENT_ROOT_DIR}/bin/salome:\${PATH}
-    export LD_LIBRARY_PATH=\${COMPONENT_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH}
-    export PYTHONPATH=\${COMPONENT_ROOT_DIR}/bin/salome:\${COMPONENT_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${COMPONENT_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+    export LD_LIBRARY_PATH=\${COMPONENT_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${COMPONENT_ROOT_DIR}/bin/salome:\${COMPONENT_ROOT_DIR}/lib/salome:\${COMPONENT_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
   fi
 fi
 ##
diff --git a/config_files/FILTER.sh b/config_files/FILTER.sh
index 1debe3b..4b902e5 100755
--- a/config_files/FILTER.sh
+++ b/config_files/FILTER.sh
@@ -29,21 +29,14 @@ return 1
 }
 
 print_env_bin(){
-if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
-    LIB_PREFIX=64
-elif [ -d ${PRODUCT_DIR}/lib ] ; then 
-    LIB_PREFIX=""
-else 
-    LIB_PREFIX=64
-fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export FILTER_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
     export PATH=\${FILTER_ROOT_DIR}/bin/salome:\${PATH}
-    export LD_LIBRARY_PATH=\${FILTER_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH}
-    export PYTHONPATH=\${FILTER_ROOT_DIR}/bin/salome:\${FILTER_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+    export LD_LIBRARY_PATH=\${FILTER_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${FILTER_ROOT_DIR}/bin/salome:\${FILTER_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
   fi
 fi
 ##
diff --git a/config_files/GEOM.sh b/config_files/GEOM.sh
index 75d4eb7..77736d2 100755
--- a/config_files/GEOM.sh
+++ b/config_files/GEOM.sh
@@ -30,21 +30,14 @@ return 1
 }
 
 print_env_bin(){
-if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
-    LIB_PREFIX=64
-elif [ -d ${PRODUCT_DIR}/lib ] ; then 
-    LIB_PREFIX=""
-else 
-    LIB_PREFIX=64
-fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export GEOM_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
     export PATH=\${GEOM_ROOT_DIR}/bin/salome:\${PATH}
-    export LD_LIBRARY_PATH=\${GEOM_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH}
-    export PYTHONPATH=\${GEOM_ROOT_DIR}/bin/salome:\${GEOM_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${GEOM_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+    export LD_LIBRARY_PATH=\${GEOM_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${GEOM_ROOT_DIR}/bin/salome:\${GEOM_ROOT_DIR}/lib/salome:\${GEOM_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
   fi
 fi
 ##
diff --git a/config_files/GHS3DPLUGIN.sh b/config_files/GHS3DPLUGIN.sh
index 3fdb71a..70e4a22 100755
--- a/config_files/GHS3DPLUGIN.sh
+++ b/config_files/GHS3DPLUGIN.sh
@@ -31,22 +31,13 @@ return 1
 }
 
 print_env_bin(){
-
-if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
-    LIB_PREFIX=64
-elif [ -d ${PRODUCT_DIR}/lib ] ; then 
-    LIB_PREFIX=""
-else 
-    LIB_PREFIX=64
-fi
-
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export GHS3DPLUGIN_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
-    export LD_LIBRARY_PATH=\${GHS3DPLUGIN_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH}
-    export PYTHONPATH=\${GHS3DPLUGIN_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${GHS3DPLUGIN_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+    export LD_LIBRARY_PATH=\${GHS3DPLUGIN_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${GHS3DPLUGIN_ROOT_DIR}/lib/salome:\${GHS3DPLUGIN_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
   fi
 fi
 ##
diff --git a/config_files/GHS3DPRLPLUGIN.sh b/config_files/GHS3DPRLPLUGIN.sh
index f64ab18..ab63b15 100755
--- a/config_files/GHS3DPRLPLUGIN.sh
+++ b/config_files/GHS3DPRLPLUGIN.sh
@@ -29,21 +29,14 @@ return 1
 }
 
 print_env_bin(){
-if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
-    LIB_PREFIX=64
-elif [ -d ${PRODUCT_DIR}/lib ] ; then 
-    LIB_PREFIX=""
-else 
-    LIB_PREFIX=64
-fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export GHS3DPRLPLUGIN_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
     export PATH=\${GHS3DPRLPLUGIN_ROOT_DIR}/bin/salome:\${PATH}
-    export LD_LIBRARY_PATH=\${GHS3DPRLPLUGIN_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH}
-    export PYTHONPATH=\${GHS3DPRLPLUGIN_ROOT_DIR}/bin/salome:\${GHS3DPRLPLUGIN_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+    export LD_LIBRARY_PATH=\${GHS3DPRLPLUGIN_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${GHS3DPRLPLUGIN_ROOT_DIR}/bin/salome:\${GHS3DPRLPLUGIN_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
   fi
 fi
 ##
diff --git a/config_files/GUI.sh b/config_files/GUI.sh
index d4bef9a..995a691 100755
--- a/config_files/GUI.sh
+++ b/config_files/GUI.sh
@@ -30,21 +30,14 @@ return 1
 }
 
 print_env_bin(){
-if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
-    LIB_PREFIX=64
-elif [ -d ${PRODUCT_DIR}/lib ] ; then 
-    LIB_PREFIX=""
-else 
-    LIB_PREFIX=64
-fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export GUI_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
     export PATH=\${GUI_ROOT_DIR}/bin/salome:\${PATH}
-    export LD_LIBRARY_PATH=\${GUI_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH}
-    export PYTHONPATH=\${GUI_ROOT_DIR}/bin/salome:\${GUI_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${GUI_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+    export LD_LIBRARY_PATH=\${GUI_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${GUI_ROOT_DIR}/bin/salome:\${GUI_ROOT_DIR}/lib/salome:\${GUI_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
   fi
 fi
 ##
diff --git a/config_files/HELLO.sh b/config_files/HELLO.sh
index 25fa4bb..5804b0c 100755
--- a/config_files/HELLO.sh
+++ b/config_files/HELLO.sh
@@ -29,21 +29,14 @@ return 1
 }
 
 print_env_bin(){
-if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
-    LIB_PREFIX=64
-elif [ -d ${PRODUCT_DIR}/lib ] ; then 
-    LIB_PREFIX=""
-else 
-    LIB_PREFIX=64
-fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export HELLO_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
     export PATH=\${HELLO_ROOT_DIR}/bin/salome:\${PATH}
-    export LD_LIBRARY_PATH=\${HELLO_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH}
-    export PYTHONPATH=\${HELLO_ROOT_DIR}/bin/salome:\${HELLO_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${HELLO_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+    export LD_LIBRARY_PATH=\${HELLO_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${HELLO_ROOT_DIR}/bin/salome:\${HELLO_ROOT_DIR}/lib/salome:\${HELLO_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
   fi
 fi
 ##
diff --git a/config_files/HexoticPLUGIN.sh b/config_files/HexoticPLUGIN.sh
index 4fc5cea..f678da6 100755
--- a/config_files/HexoticPLUGIN.sh
+++ b/config_files/HexoticPLUGIN.sh
@@ -29,21 +29,14 @@ return 1
 }
 
 print_env_bin(){
-if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
-    LIB_PREFIX=64
-elif [ -d ${PRODUCT_DIR}/lib ] ; then 
-    LIB_PREFIX=""
-else 
-    LIB_PREFIX=64
-fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export HexoticPLUGIN_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
     export PATH=\${HexoticPLUGIN_ROOT_DIR}/bin/salome:\${PATH}
-    export LD_LIBRARY_PATH=\${HexoticPLUGIN_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH}
-    export PYTHONPATH=\${HexoticPLUGIN_ROOT_DIR}/bin/salome:\${HexoticPLUGIN_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+    export LD_LIBRARY_PATH=\${HexoticPLUGIN_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${HexoticPLUGIN_ROOT_DIR}/bin/salome:\${HexoticPLUGIN_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
   fi
 fi
 ##
diff --git a/config_files/KERNEL.sh b/config_files/KERNEL.sh
index 6c668e1..b834039 100755
--- a/config_files/KERNEL.sh
+++ b/config_files/KERNEL.sh
@@ -30,21 +30,14 @@ return 1
 }
 
 print_env_bin(){
-if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
-    LIB_PREFIX=64
-elif [ -d ${PRODUCT_DIR}/lib ] ; then 
-    LIB_PREFIX=""
-else 
-    LIB_PREFIX=64
-fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export KERNEL_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
     export PATH=\${KERNEL_ROOT_DIR}/bin/salome:\${PATH}
-    export LD_LIBRARY_PATH=\${KERNEL_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH}
-    export PYTHONPATH=\${KERNEL_ROOT_DIR}/bin/salome:\${KERNEL_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${KERNEL_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+    export LD_LIBRARY_PATH=\${KERNEL_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${KERNEL_ROOT_DIR}/bin/salome:\${KERNEL_ROOT_DIR}/lib/salome:\${KERNEL_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
   fi
 fi
 ##
diff --git a/config_files/LIGHT.sh b/config_files/LIGHT.sh
index f3edf87..e53dd82 100755
--- a/config_files/LIGHT.sh
+++ b/config_files/LIGHT.sh
@@ -29,19 +29,12 @@ return 1
 }
 
 print_env_bin(){
-if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
-    LIB_PREFIX=64
-elif [ -d ${PRODUCT_DIR}/lib ] ; then 
-    LIB_PREFIX=""
-else 
-    LIB_PREFIX=64
-fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export LIGHT_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
-    export LD_LIBRARY_PATH=\${LIGHT_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH}
+    export LD_LIBRARY_PATH=\${LIGHT_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
   fi
 fi
 ##
diff --git a/config_files/MED.sh b/config_files/MED.sh
index 466ee07..07d75d0 100755
--- a/config_files/MED.sh
+++ b/config_files/MED.sh
@@ -30,21 +30,14 @@ return 1
 }
 
 print_env_bin(){
-if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
-    LIB_PREFIX=64
-elif [ -d ${PRODUCT_DIR}/lib ] ; then 
-    LIB_PREFIX=""
-else 
-    LIB_PREFIX=64
-fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export MED_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
     export PATH=\${MED_ROOT_DIR}/bin/salome:\${PATH}
-    export LD_LIBRARY_PATH=\${MED_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH}
-    export PYTHONPATH=\${MED_ROOT_DIR}/bin/salome:\${MED_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${MED_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+    export LD_LIBRARY_PATH=\${MED_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${MED_ROOT_DIR}/bin/salome:\${MED_ROOT_DIR}/lib/salome:\${MED_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
   fi
 fi
 ##
diff --git a/config_files/MULTIPR.sh b/config_files/MULTIPR.sh
index f137380..0e9e116 100755
--- a/config_files/MULTIPR.sh
+++ b/config_files/MULTIPR.sh
@@ -29,21 +29,14 @@ return 1
 }
 
 print_env_bin(){
-if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
-    LIB_PREFIX=64
-elif [ -d ${PRODUCT_DIR}/lib ] ; then 
-    LIB_PREFIX=""
-else 
-    LIB_PREFIX=64
-fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export MULTIPR_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
     export PATH=\${MULTIPR_ROOT_DIR}/bin/salome:\${PATH}
-    export LD_LIBRARY_PATH=\${MULTIPR_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH}
-    export PYTHONPATH=\${MULTIPR_ROOT_DIR}/bin/salome:\${MULTIPR_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+    export LD_LIBRARY_PATH=\${MULTIPR_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${MULTIPR_ROOT_DIR}/bin/salome:\${MULTIPR_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
   fi
 fi
 ##
diff --git a/config_files/NETGENPLUGIN.sh b/config_files/NETGENPLUGIN.sh
index 2d559db..7be4e69 100755
--- a/config_files/NETGENPLUGIN.sh
+++ b/config_files/NETGENPLUGIN.sh
@@ -31,20 +31,13 @@ return 1
 }
 
 print_env_bin(){
-if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
-    LIB_PREFIX=64
-elif [ -d ${PRODUCT_DIR}/lib ] ; then 
-    LIB_PREFIX=""
-else 
-    LIB_PREFIX=64
-fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export NETGENPLUGIN_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
-    export LD_LIBRARY_PATH=\${NETGENPLUGIN_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH}
-    export PYTHONPATH=\${NETGENPLUGIN_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${NETGENPLUGIN_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+    export LD_LIBRARY_PATH=\${NETGENPLUGIN_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${NETGENPLUGIN_ROOT_DIR}/lib/salome:\${NETGENPLUGIN_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
   fi
 fi
 ##
diff --git a/config_files/PYCALCULATOR.sh b/config_files/PYCALCULATOR.sh
index 69099f0..a965c33 100755
--- a/config_files/PYCALCULATOR.sh
+++ b/config_files/PYCALCULATOR.sh
@@ -30,21 +30,14 @@ return 1
 }
 
 print_env_bin(){
-if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
-    LIB_PREFIX=64
-elif [ -d ${PRODUCT_DIR}/lib ] ; then 
-    LIB_PREFIX=""
-else 
-    LIB_PREFIX=64
-fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export PYCALCULATOR_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
     export PATH=\${PYCALCULATOR_ROOT_DIR}/bin/salome:\${PATH}
-    export LD_LIBRARY_PATH=\${PYCALCULATOR_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH}
-    export PYTHONPATH=\${PYCALCULATOR_ROOT_DIR}/bin/salome:\${PYCALCULATOR_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+    export LD_LIBRARY_PATH=\${PYCALCULATOR_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${PYCALCULATOR_ROOT_DIR}/bin/salome:\${PYCALCULATOR_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
   fi
 fi
 ##
diff --git a/config_files/PYHELLO.sh b/config_files/PYHELLO.sh
index 25204e7..7855222 100755
--- a/config_files/PYHELLO.sh
+++ b/config_files/PYHELLO.sh
@@ -29,20 +29,13 @@ return 1
 }
 
 print_env_bin(){
-if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
-    LIB_PREFIX=64
-elif [ -d ${PRODUCT_DIR}/lib ] ; then 
-    LIB_PREFIX=""
-else 
-    LIB_PREFIX=64
-fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export PYHELLO_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
     export PATH=\${PYHELLO_ROOT_DIR}/bin/salome:\${PATH}
-    export PYTHONPATH=\${PYHELLO_ROOT_DIR}/bin/salome:\${PYHELLO_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+    export PYTHONPATH=\${PYHELLO_ROOT_DIR}/bin/salome:\${PYHELLO_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
   fi
 fi
 ##
diff --git a/config_files/PYLIGHT.sh b/config_files/PYLIGHT.sh
index 0edaf3c..1be242b 100755
--- a/config_files/PYLIGHT.sh
+++ b/config_files/PYLIGHT.sh
@@ -29,20 +29,13 @@ return 1
 }
 
 print_env_bin(){
-#if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
-#    LIB_PREFIX=64
-#elif [ -d ${PRODUCT_DIR}/lib ] ; then 
-#    LIB_PREFIX=""
-#else 
-#    LIB_PREFIX=64
-#fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export PYLIGHT_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
     export PATH=\${PYLIGHT_ROOT_DIR}/bin/salome:\${PATH}
-    export PYTHONPATH=\${PYLIGHT_ROOT_DIR}/bin/salome:\\${PYTHONPATH}
+    export PYTHONPATH=\${PYLIGHT_ROOT_DIR}/bin/salome:\${PYTHONPATH}
   fi
 fi
 ##
diff --git a/config_files/RANDOMIZER.sh b/config_files/RANDOMIZER.sh
index 70a460c..6bad8d2 100755
--- a/config_files/RANDOMIZER.sh
+++ b/config_files/RANDOMIZER.sh
@@ -29,21 +29,14 @@ return 1
 }
 
 print_env_bin(){
-if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
-    LIB_PREFIX=64
-elif [ -d ${PRODUCT_DIR}/lib ] ; then 
-    LIB_PREFIX=""
-else 
-    LIB_PREFIX=64
-fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export RANDOMIZER_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
     export PATH=\${RANDOMIZER_ROOT_DIR}/bin/salome:\${PATH}
-    export LD_LIBRARY_PATH=\${RANDOMIZER_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH}
-    export PYTHONPATH=\${RANDOMIZER_ROOT_DIR}/bin/salome:\${RANDOMIZER_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+    export LD_LIBRARY_PATH=\${RANDOMIZER_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${RANDOMIZER_ROOT_DIR}/bin/salome:\${RANDOMIZER_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
   fi
 fi
 ##
diff --git a/config_files/SIERPINSKY.sh b/config_files/SIERPINSKY.sh
index 342cf06..a0ea9c5 100755
--- a/config_files/SIERPINSKY.sh
+++ b/config_files/SIERPINSKY.sh
@@ -29,21 +29,14 @@ return 1
 }
 
 print_env_bin(){
-if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
-    LIB_PREFIX=64
-elif [ -d ${PRODUCT_DIR}/lib ] ; then 
-    LIB_PREFIX=""
-else 
-    LIB_PREFIX=64
-fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export SIERPINSKY_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
     export PATH=\${SIERPINSKY_ROOT_DIR}/bin/salome:\${PATH}
-    export LD_LIBRARY_PATH=\${SIERPINSKY_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH}
-    export PYTHONPATH=\${SIERPINSKY_ROOT_DIR}/bin/salome:\${SIERPINSKY_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+    export LD_LIBRARY_PATH=\${SIERPINSKY_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${SIERPINSKY_ROOT_DIR}/bin/salome:\${SIERPINSKY_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
   fi
 fi
 ##
diff --git a/config_files/SMESH.sh b/config_files/SMESH.sh
index c4d0e29..6e4f570 100755
--- a/config_files/SMESH.sh
+++ b/config_files/SMESH.sh
@@ -30,21 +30,14 @@ return 1
 }
 
 print_env_bin(){
-if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
-    LIB_PREFIX=64
-elif [ -d ${PRODUCT_DIR}/lib ] ; then 
-    LIB_PREFIX=""
-else 
-    LIB_PREFIX=64
-fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export SMESH_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
     export PATH=\${SMESH_ROOT_DIR}/bin/salome:\${PATH}
-    export LD_LIBRARY_PATH=\${SMESH_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH}
-    export PYTHONPATH=\${SMESH_ROOT_DIR}/bin/salome:\${SMESH_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${SMESH_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+    export LD_LIBRARY_PATH=\${SMESH_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${SMESH_ROOT_DIR}/bin/salome:\${SMESH_ROOT_DIR}/lib/salome:\${SMESH_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
   fi
 fi
 ##
diff --git a/config_files/VISU.sh b/config_files/VISU.sh
index 75c5911..081b111 100755
--- a/config_files/VISU.sh
+++ b/config_files/VISU.sh
@@ -30,21 +30,14 @@ return 1
 }
 
 print_env_bin(){
-if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
-    LIB_PREFIX=64
-elif [ -d ${PRODUCT_DIR}/lib ] ; then 
-    LIB_PREFIX=""
-else 
-    LIB_PREFIX=64
-fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export VISU_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
     export PATH=\${VISU_ROOT_DIR}/bin/salome:\${PATH}
-    export LD_LIBRARY_PATH=\${VISU_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH}
-    export PYTHONPATH=\${VISU_ROOT_DIR}/bin/salome:\${VISU_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${VISU_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+    export LD_LIBRARY_PATH=\${VISU_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${VISU_ROOT_DIR}/bin/salome:\${VISU_ROOT_DIR}/lib/salome:\${VISU_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
   fi
 fi
 ##
diff --git a/config_files/YACS.sh b/config_files/YACS.sh
index b140099..1a58836 100755
--- a/config_files/YACS.sh
+++ b/config_files/YACS.sh
@@ -29,21 +29,14 @@ return 1
 }
 
 print_env_bin(){
-if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
-    LIB_PREFIX=64
-elif [ -d ${PRODUCT_DIR}/lib ] ; then 
-    LIB_PREFIX=""
-else 
-    LIB_PREFIX=64
-fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export YACS_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
     export PATH=\${YACS_ROOT_DIR}/bin/salome:\${PATH}
-    export LD_LIBRARY_PATH=\${YACS_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH}
-    export PYTHONPATH=\${YACS_ROOT_DIR}/bin/salome:\${YACS_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+    export LD_LIBRARY_PATH=\${YACS_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${YACS_ROOT_DIR}/bin/salome:\${YACS_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
   fi
 fi
 ##
diff --git a/config_files/omniORB-4.1.3.sh b/config_files/omniORB-4.1.3.sh
index b665377..216fbda 100755
--- a/config_files/omniORB-4.1.3.sh
+++ b/config_files/omniORB-4.1.3.sh
@@ -53,7 +53,7 @@ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export OMNIORBDIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export OMNIORB_CONFIG=\${OMNIORBDIR}/.omniORB.cfg
-export PYTHONPATH=\${OMNIORBDIR}/lib${OMNI_LIB_PREFIX}:\${OMNIORBDIR}/lib${OMNI_LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages:\${PYTHONPATH}
+export PYTHONPATH=\${OMNIORBDIR}/lib:\${OMNIORBDIR}/lib/python\${PYTHON_VERSION}/site-packages:\${PYTHONPATH}
 export PATH=\$OMNIORBDIR/bin:\$PATH
 export LD_LIBRARY_PATH=\$OMNIORBDIR/lib:\$LD_LIBRARY_PATH 
 ##
-- 
2.39.2