Update for Salome 4.1.3

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

diff --git a/config_files/LIGHT.sh b/config_files/LIGHT.sh
index f4b2199ca2be381d7ac1fb2155e351ad5bfe5472..50ef5714e9faf373e314e0541ff3e81b55ca8d36 100755 (executable)
--- a/config_files/LIGHT.sh
+++ b/config_files/LIGHT.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="4.1.1"
+VERSION="4.1.3"
 
 check_version(){
 if [ -n "${LIGHT_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
@@ -119,7 +121,7 @@ check_jb tar xfz ${SRC_DIR}/LIGHTsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
 export LIGHT_ROOT_DIR=${PRODUCT_DIR}
-modif_la_files ${PRODUCT_DIR}
+test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
 
 # to generate environment scripts
 try_preinstalled