From 6d2ea19eaef29c289351c031b8b913c7d807eb17 Mon Sep 17 00:00:00 2001 From: maintenance team Date: Mon, 23 Nov 2009 14:06:28 +0000 Subject: [PATCH] Small update --- config_files/common.sh | 7 +++++++ config_files/graphviz-2.24.0.sh | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/config_files/common.sh b/config_files/common.sh index 8c2e35e..7582c54 100755 --- a/config_files/common.sh +++ b/config_files/common.sh @@ -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 diff --git a/config_files/graphviz-2.24.0.sh b/config_files/graphviz-2.24.0.sh index 62e1560..846e72c 100755 --- a/config_files/graphviz-2.24.0.sh +++ b/config_files/graphviz-2.24.0.sh @@ -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 -- 2.39.2