Update for excluduing lib64

diff --git a/config_files/BLSURFPLUGIN.sh b/config_files/BLSURFPLUGIN.sh
index 8fd50503e7cced72adb37326638cd73bf2806112..9306af03b6fb92d9f8a35991db99446469d251b3 100755 (executable)
--- 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 24abaa5a165c2d23584143b1dfa35317ef0eef23..0fa1fb172119ce7fffb1ba253852e6efae8efb20 100755 (executable)
--- 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 12f48117fd017e26b246aaab4e2b356cfc0bbd4e..f1347249d778ae325829e7adb1440196a12c614f 100755 (executable)
--- 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 1debe3be66805f4fc59565577fc4df536b272724..4b902e5fac4b00f57e5b0329c170bf61fb835a44 100755 (executable)
--- 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 75d4eb720360b309d1993be06ee16b71ea3b22fa..77736d22fae5e8f71c1635d1a004e71965455f44 100755 (executable)
--- 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 3fdb71a338902916c14599b2e7cb31d08a246f4f..70e4a2244e38db4a4d10eb7bfdd837173ff8ccdc 100755 (executable)
--- 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 f64ab186d3c7b4bb8afe0433e30c0011d3ed1797..ab63b15a28865099bfeb5c21d9cd36b4d85a4316 100755 (executable)
--- 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 d4bef9a85178db5ed967908decbe8573d53b88ea..995a691ca056d17fb13ab4e8c9caf35a4e62c7dc 100755 (executable)
--- 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 25fa4bbd69330278da0a89105502d0777585b248..5804b0c2df849b1b20b300a3c99714c512ad5b36 100755 (executable)
--- 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 4fc5cea2139b0ea9d676e5415f1e8adf777ebac8..f678da69ed413f82cd636d4bee4f20b0d8739256 100755 (executable)
--- 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 6c668e1bf912b8a783ccb22ee7319feda50be1a3..b83403927ff844ed2dd5553cd487b84e352a2e57 100755 (executable)
--- 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 f3edf87f01d74c476014840a19ad26e8e9bccd1e..e53dd827ecbded74e949d694604191165c028e2d 100755 (executable)
--- 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 466ee070e63494e169b75cf50794f779f62d40e6..07d75d0242cdfb2ccdf5d2bcc168101663176427 100755 (executable)
--- 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 f1373804eddc45ef0b709519a8220f3443c1a03b..0e9e116c078017b0df6734badf1dda42f53669be 100755 (executable)
--- 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 2d559db57f2c5e1eb9a1fefe664779fd17548f58..7be4e6948faccdbf4ec994446b812f4136c1e258 100755 (executable)
--- 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 69099f00c5972fcfbf11f5d33e5ae960967a20b7..a965c335e6c23a91c7fc154503afde6ed3dc6d14 100755 (executable)
--- 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 25204e70ce698b765c98d6cbad110246fcdad2b4..78552225de6de860f5948c2f520a794d4794fc45 100755 (executable)
--- 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 0edaf3c3a12f51e6646a634bdcc592a9efb0e1ba..1be242b39a8891303eb94518a0f6790cfaef43e4 100755 (executable)
--- 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 70a460c152a65abedb1f8a7166ab5b3bf12b371e..6bad8d2e382baf0529230bb3e1dd7aa5ba0fcdf8 100755 (executable)
--- 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 342cf0617cfadf98ad9666c6b19fe09faa2cac23..a0ea9c54f8aca3d070f26907da97a9c03ae5045f 100755 (executable)
--- 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 c4d0e298b11993ac4bf123133e758743d9e0e885..6e4f57081d533c5037e29aabfed154e0e09ea47e 100755 (executable)
--- 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 75c59114d430a9bc58b25c6c85f04e98cdefc646..081b111e26c76c8015463a21ec976d8bf4262653 100755 (executable)
--- 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 b1400998cab57aaf37699385ff75ca7f4de732db..1a588362eaa8cdec269ec8a2f486e080b0d9d47d 100755 (executable)
--- 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 b6653770a309061fff721b0d8b85b407e679af50..216fbda16bd40d6b5929064e84df9992f54c6e36 100755 (executable)
--- 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 
 ##