Update for Salome 4.1.3

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

diff --git a/config_files/HELLO.sh b/config_files/HELLO.sh
index 48befd4a8eebeb045cd2ba677b97c60a04d31907..dd283fa394187e64c2e46186c8c8d59b05829d57 100755 (executable)
--- a/config_files/HELLO.sh
+++ b/config_files/HELLO.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="4.1.1"
+VERSION="4.1.3"
 
 check_version(){
 if [ -n "${HELLO_ROOT_DIR}" ]; then
@@ -31,10 +31,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
@@ -121,7 +123,7 @@ check_jb tar xfz ${SRC_DIR}/HELLOsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
 export HELLO_ROOT_DIR=${PRODUCT_DIR}
-modif_la_files ${PRODUCT_DIR}
+test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
 
 cd ${PRODUCT_DIR}/bin/salome
 sed -e "s%export KERNEL_ROOT_DIR=.*%export KERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}%g" runAppli > _runAppli