From: maintenance team <salome-mnt@opencascade.com>
Date: Thu, 18 Jun 2009 08:04:03 +0000 (+0000)
Subject: Small corrections for 64 bit
X-Git-Tag: V5_1_2~5
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d88bcec0f32b65945a11613b3cfeebf148e2be1f;p=tools%2Finstall.git

Small corrections for 64 bit
---

diff --git a/config_files/PYLIGHT.sh b/config_files/PYLIGHT.sh
index 71464dc..0edaf3c 100755
--- a/config_files/PYLIGHT.sh
+++ b/config_files/PYLIGHT.sh
@@ -29,19 +29,20 @@ 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
+#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 LD_LIBRARY_PATH=\${PYLIGHT_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH}
+    export PATH=\${PYLIGHT_ROOT_DIR}/bin/salome:\${PATH}
+    export PYTHONPATH=\${PYLIGHT_ROOT_DIR}/bin/salome:\\${PYTHONPATH}
   fi
 fi
 ##
diff --git a/config_files/xdata-0.6.3.sh b/config_files/xdata-0.6.3.sh
index 0a5a328..9d04711 100755
--- a/config_files/xdata-0.6.3.sh
+++ b/config_files/xdata-0.6.3.sh
@@ -19,19 +19,12 @@ return 0
 
 print_env_bin()
 {
-if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
-    PYTHON_LIB_PREFIX=64
-elif [ -d ${PRODUCT_DIR}/lib ] ; then 
-    PYTHON_LIB_PREFIX=""
-else 
-    PYTHON_LIB_PREFIX=64
-fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM 
 export XDATAROOT=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PATH=\${XDATAROOT}/bin:\${PATH}
 export PYTHON_VERSION=\`python -c "import sys; print sys.version[:3]"\`
-export PYTHONPATH=\${XDATAROOT}/lib${PYTHON_LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/xdata:\${PYTHONPATH}
+export PYTHONPATH=\${XDATAROOT}/lib/python\${PYTHON_VERSION}/site-packages/xdata:\${PYTHONPATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})