]> SALOME platform Git repositories - tools/install.git/commitdiff
Salome HOME
Small update
authormaintenance team <salome-mnt@opencascade.com>
Mon, 23 Nov 2009 14:06:28 +0000 (14:06 +0000)
committermaintenance team <salome-mnt@opencascade.com>
Mon, 23 Nov 2009 14:06:28 +0000 (14:06 +0000)
config_files/common.sh
config_files/graphviz-2.24.0.sh

index 8c2e35eae29602d2c0cead11599bd01a2d2c4a88..7582c54d460aabbb68238908ae140244fa77144d 100755 (executable)
@@ -846,6 +846,13 @@ if [ "$l" != "X" ] ; then
     sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*QScintilla-[0-9]\.[0-9]\(\.[0-9]\)\?/lib% \1${qscintilladir}%g" $l > $l"_"
     chmod -f --reference=$l $l"_"
     mv -f $l"_" $l     
+
+   # 21. process expat-2.0.1 dependencies
+       expatdir=${EXPAT_ROOT}/lib
+       sed -e "s%-L[^[:space:]]*expat[^[:space:]]*/lib%-L${expatdir}%g" \
+           -e "s%[^[:space:]]*expat[^[:space:]]*/lib/libexpat.la%-lexpat%g" $l > $l"_"
+       chmod -f --reference=$l $l"_"
+       mv -f $l"_" $l          
  
 fi
 done
index 62e156027e171b9423f2eea6165e99fdb6358614..846e72cc143a4d8a18e92de13de75f4ffd020506 100755 (executable)
@@ -138,6 +138,13 @@ for l in X `find $ldir -name "*.la"`; do
        libdir=`grep -e "^libdir=.*" $l | sed -e "s/^libdir=[\'|\"]\(.*\)[\'|\"]/\1/g"`
        sed -e "s%${libdir}%${lpath}%g" $l > $l"_"
        chmod -f --reference=$l $l"_" ; mv -f $l"_" $l
+
+       expatdir=${EXPAT_ROOT}/lib
+       sed -e "s%-L[^[:space:]]*expat[^[:space:]]*/lib%-L${expatdir}%g" \
+           -e "s%[^[:space:]]*expat[^[:space:]]*/lib/libexpat.la%-lexpat%g" $l > $l"_"
+       chmod -f --reference=$l $l"_"
+       mv -f $l"_" $l 
+
     fi
 done