Update for Salome 4.1.3

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

diff --git a/config_files/KERNEL.sh b/config_files/KERNEL.sh
index e6ee3e22fdc3eac7dc37922c0854197d2fb024d2..e79099af87625db62cd053cab473f3f963d6f8ec 100755 (executable)
--- a/config_files/KERNEL.sh
+++ b/config_files/KERNEL.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="4.1.1"
+VERSION="4.1.3"
 
 check_version(){
 if [ -n "${KERNEL_ROOT_DIR}" ]; then
@@ -32,10 +32,12 @@ return 1
 }
 
 print_env_bin(){
-if test `uname -m` = "x86_64" ; then
-export LIB_PREFIX=64
-else
-export LIB_PREFIX=""
+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
@@ -131,7 +133,7 @@ fi
 
 # modify all *.la files
 export KERNEL_ROOT_DIR=${PRODUCT_DIR}
-modif_la_files ${PRODUCT_DIR}
+test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
 
 # to generate environment scripts
 try_preinstalled
@@ -141,13 +143,15 @@ pickup_env()
 {
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE} ${PRODUCT_DIR}
 if [ -d ${PRODUCT_DIR} ] ; then
-    cd ${PRODUCT_DIR}
+    pushd ${PRODUCT_DIR}
     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
     cp -f ${PRODUCT_DIR}/salome.sh $dir/env.d
+    popd
 fi
+create_config.sh ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_DIR}
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src ${PRODUCT_SRC_DIR}
 }
 
@@ -162,6 +166,7 @@ SRC_DIR=$8;
 shift
 REMOVE_SRC_TMP=$8;
 shift
+shift
 SINGLE_DIR=$9;
 export PRODUCT="KERNEL_${VERSION}"
 export PRODUCT_SRC="KERNEL_SRC_${VERSION}"