X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=config_files%2FCAS-6.0.sh;h=3e8b4dae59c97496e0a3e6fb753efd7b6ecdad25;hb=01667989751574f467b3810b8c4f8580d28240b9;hp=fa1375889431d636198e00902570b348b4134885;hpb=1a68c73e1396a53237d6ee1bd63b674ae9ca8249;p=tools%2Finstall.git

diff --git a/config_files/CAS-6.0.sh b/config_files/CAS-6.0.sh
index fa13758..3e8b4da 100755
--- 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 
@@ -133,12 +133,17 @@ 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
+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