Merge fixes from SALOME_3 branch

[tools/install.git] / config_files / CAS-5.2.4a.sh

diff --git a/config_files/CAS-5.2.4a.sh b/config_files/CAS-5.2.4a.sh
index e7ef46fda40603404f94f8176d59a110df892ac4..7b538025e1e496bf5f7aa40584377b00ae32e6cc 100755 (executable)
--- a/config_files/CAS-5.2.4a.sh
+++ b/config_files/CAS-5.2.4a.sh
@@ -86,12 +86,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