Adding "64" lib prefix to MODULE_BIN.sh files

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

diff --git a/config_files/COMPONENT_BIN.sh b/config_files/COMPONENT_BIN.sh
index 6634e631821eb90ccf936d9e2220a00ce4f7e278..694e5b28926dbb2d3c0a0bc3a13414d4cd5b82e6 100755 (executable)
--- a/config_files/COMPONENT_BIN.sh
+++ b/config_files/COMPONENT_BIN.sh
@@ -14,14 +14,21 @@ return 1
 }
 
 print_env(){
+
+if test `uname -m` = "x86_64" ; then
+export LIB_PREFIX=64
+else
+export LIB_PREFIX=""
+fi
+
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export COMPONENT_ROOT_DIR=\${INSTALL_ROOT}/${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/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}
+    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}
   fi
 fi
 ##
@@ -33,6 +40,11 @@ make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 # looks for the native product and collects it's environment (used by make_env())
 try_native(){
 check_version
+if test `uname -m` = "x86_64" ; then
+export LIB_PREFIX=64
+else
+export LIB_PREFIX=""
+fi
 if [ $? -eq 0 ] ; then
     cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
@@ -40,8 +52,8 @@ export COMPONENT_ROOT_DIR=\${INSTALL_ROOT}/${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/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}
+    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}
   fi
 fi
 ##