Salome HOME
SALOME 6.5.0 preparation: update copyright
[tools/install.git] / config_files / FILTER.sh
index 1debe3be66805f4fc59565577fc4df536b272724..718ae04db63d711aaf099cfa6034c3e6c5ceb9f2 100755 (executable)
@@ -6,7 +6,7 @@
 #  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 #  Project   : SALOME
 #  Module    : Installation Wizard
-#  Copyright : 2002-2008 CEA
+#  Copyright : 2002-2012 CEA
 #
 #  This script is the part of the SALOME installation procedure.
 #
@@ -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
+  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
 ##