Remove build directory

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

diff --git a/config_files/KERNEL.sh b/config_files/KERNEL.sh
index 6c668e1bf912b8a783ccb22ee7319feda50be1a3..3910690a12d84a7be939d8f2b3300c4e47ca96b8 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
+  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
 ##
@@ -95,7 +88,7 @@ fi
 
 CUR_DIR=`pwd`
 cd ${INST_ROOT}
-check_jb ./build.sh -o -c -d -v 0 -p $INST_ROOT KERNEL
+check_jb ./build.sh -o -b -d -v 0 -p $INST_ROOT KERNEL
 
 # create environment for the built binaries
 cd $CUR_DIR
@@ -145,7 +138,12 @@ if [ -d ${PRODUCT_DIR} ] ; then
     version=`cat bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]'`
     dir="${HOME}/salome_appli_$version"
     ./bin/salome/createAppli.sh $dir
-    rm -rf $dir/env.d/*.sh
+    if [ -d $dir/env.d ] ; then
+       rm -rf $dir/env.d/*.sh
+    fi
+    if [ ! -e $dir/env.d ] ; then
+       mkdir -p $dir/env.d
+    fi
     cp -f ${PRODUCT_DIR}/salome.sh $dir/env.d
     popd > /dev/null
 fi