Merge changes from SALOME_3_DS branch

[tools/install.git] / config_files / CAS-6.0.sh

diff --git a/config_files/CAS-6.0.sh b/config_files/CAS-6.0.sh
index 81eab0f2efca23c0f076de53afc76be13aba29d8..3e8b4dae59c97496e0a3e6fb753efd7b6ecdad25 100755 (executable)
--- a/config_files/CAS-6.0.sh
+++ b/config_files/CAS-6.0.sh
@@ -25,7 +25,7 @@ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export CASROOT=\${INSTALL_ROOT}/${PRODUCT}
 export PATH=\${CASROOT}/bin:\${PATH}
-export LD_LIBRARY_PATH=\${CASROOT}/lib:\${LD_LIBRARY_PATH}
+export LD_LIBRARY_PATH=\${CASROOT}/lib:\${CASROOT}/lin/lib:\${LD_LIBRARY_PATH}
 # Variable for Foundation Classes : 
 export CSF_UnitsLexicon=\${CASROOT}/src/UnitsAPI/Lexi_Expr.dat 
 export CSF_UnitsDefinition=\${CASROOT}/src/UnitsAPI/Units.dat 
@@ -49,7 +49,7 @@ if [ $? -eq 0 ] ; then
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export CASROOT=${CASROOT}
 export PATH=\${CASROOT}/bin:\${PATH}
-export LD_LIBRARY_PATH=\${CASROOT}/lib:\${LD_LIBRARY_PATH}
+export LD_LIBRARY_PATH=\${CASROOT}/lib:\${CASROOT}/lin/lib:\${LD_LIBRARY_PATH}
 # Variable for Foundation Classes : 
 export CSF_UnitsLexicon=\${CASROOT}/src/UnitsAPI/Lexi_Expr.dat 
 export CSF_UnitsDefinition=\${CASROOT}/src/UnitsAPI/Units.dat 
@@ -119,7 +119,7 @@ cp -rp src/DrawResources ${PRODUCT_DIR}/src
 (cd ${PRODUCT_DIR}; mkdir -p lin; cd lin; ln -fs ../lib lib)
 
 #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
-rm -fr ${PRODUCT_WORK}
+cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK}
 print_env
 }
 
@@ -133,11 +133,19 @@ ldir=${PRODUCT_DIR}/lib
 if [ ! -d $ldir ]; then ldir=${PRODUCT_DIR}/Linux/lib; fi
 if [ ! -d $ldir ]; then ldir=${PRODUCT_DIR}/lin/lib; fi
 cd $ldir
-for l in `ls *.la`; do
-    libdir=`grep -e "libdir=.*" $l | sed -e "s/libdir=[\'|\"]\(.*\)[\'|\"]/\1/g"`
-    sed -e "s%${libdir}%${ldir}%g" $l > _$l
-    mv -f _$l $l
-    chmod a+x $l
+tcldir=`printenv TCLHOME`
+for l in X `find . -name "*.la"`; do
+    if [ "$l" != "X" ] ; then
+       l=`basename $l`
+       libdir=`grep -e "libdir=.*" $l | sed -e "s/libdir=[\'|\"]\(.*\)[\'|\"]/\1/g"`
+       sed -e "s%${libdir}%${ldir}%g" $l > _$l
+       mv -f _$l $l
+       if [ -n "${tcldir}" ] && [ -d "${tcldir}" ] ; then
+           sed -e "s%-L[^[:space:]]*tcltk[^[:space:]]*/lib%-L${tcldir}/lib%g" $l > _$l
+           mv -f _$l $l
+       fi
+       chmod a+x $l
+    fi
 done
 
 print_env