Fix Python dependencies pb.

[tools/install.git] / config_files / graphviz-2.16.1.sh

diff --git a/config_files/graphviz-2.16.1.sh b/config_files/graphviz-2.16.1.sh
index 7f51bf11fc904c698804a38fa8ed16d84f704f14..1a493afdae9c55a4e39979e023a7b35f9d49b2cb 100755 (executable)
--- a/config_files/graphviz-2.16.1.sh
+++ b/config_files/graphviz-2.16.1.sh
@@ -111,7 +111,6 @@ source ${INSTALL_WORK}/$SHRC
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
 check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
-cd ${PRODUCT_DIR}/lib/graphviz
 
 # modify *.la files
 ldir=${PRODUCT_DIR}/lib
@@ -119,22 +118,16 @@ cd $ldir
 
 for l in X `find $ldir -name "*.la"`; do
     if [ "$l" != "X" ] ; then
-       lpath=`dirname $l`
-       sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*${PRODUCT}% \1${PRODUCT_DIR}%g" $l > $l"_"
-       chmod -f --reference=$l $l"_" ; mv -f $l"_" $l
-       
-       pydir=""
+       pydir="" ; tcldir=""
        if [ -n "${PYTHONHOME}" ] ; then pydir=${PYTHONHOME} ; fi
-       sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*Python-[0-9]\+\.[0-9]\+\.[0-9]\+-rl% \1${pydir}%g" $l > $l"_"
-       chmod -f --reference=$l $l"_"
-       mv -f $l"_" $l
-
-       tcldir=""
        if [ -n "${TCLHOME}" ] ; then tcldir=${TCLHOME} ; fi
-       sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*tcltk-[0-9]\+\.[0-9]\+\.[0-9]\+% \1${tcldir}%g" $l > $l"_"
+       sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*${PRODUCT}% \1${PRODUCT_DIR}%g" \
+           -e "s%[[:space:]]\(-L\)\?[^[:space:]]*Python[^[:space:]]*/lib% \1${pydir}/lib%g" \
+           -e "s%[[:space:]]\(-L\)\?[^[:space:]]*tcltk[^[:space:]]*/lib% \1${tcldir}/lib%g" $l > $l"_"
        chmod -f --reference=$l $l"_"
        mv -f $l"_" $l
 
+       lpath=`dirname $l`
        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