Small update

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

diff --git a/config_files/KERNEL.sh b/config_files/KERNEL.sh
index 819918a0603f5c2845b8687f891df4f79af63c3f..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
 ##
@@ -144,7 +137,7 @@ if [ -d ${PRODUCT_DIR} ] ; then
     pushd ${PRODUCT_DIR} > /dev/null
     version=`cat bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]'`
     dir="${HOME}/salome_appli_$version"
-    bin/salome/createAppli.sh $dir
+    ./bin/salome/createAppli.sh $dir
     rm -rf $dir/env.d/*.sh
     cp -f ${PRODUCT_DIR}/salome.sh $dir/env.d
     popd > /dev/null