From: akl <akl@opencascade.com>
Date: Thu, 28 Feb 2008 06:39:34 +0000 (+0000)
Subject: Fix libxml and graphviz dependencies pb.
X-Git-Tag: V_4_1_1~5
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f7636136c06c9acf49ebb01a3c4ade1416253beb;p=tools%2Finstall.git

Fix libxml and graphviz dependencies pb.
---

diff --git a/config_files/common.sh b/config_files/common.sh
index c8d9a8a..7c6eb26 100755
--- a/config_files/common.sh
+++ b/config_files/common.sh
@@ -797,8 +797,7 @@ if [ "$l" != "X" ] ; then
     # 15. process libxml dependencies
     libxmldir=`printenv LIBXML_DIR`/lib
     if [ ! -d ${libxmldir} ] ; then libxmldir=`printenv  LIBXML_DIR`/lib ; fi
-    sed -e "s%\(.*\)\([[:space:]].*/lib/libxml2.la[[:space:]]\)\(.*\)%\1 ${libxmldir}/libxml2.la \3%g" \
-        -e "s%-L[^[:space:]]*libxml2[^[:space:]]*/lib%-L${libxmldir}%g" $l > $l"_"
+    sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*libxml2[^[:space:]]*/lib% \1${libxmldir}%g" $l > $l"_"
     mv -f $l"_" $l 	
 
     # 16. process metis dependencies
@@ -823,12 +822,11 @@ if [ "$l" != "X" ] ; then
 	mv -f $l"_" $l
 
     # 19. process graphviz dependencies
-    graphvizdir=`printenv GRAPHVIZHOME`
-    if [ -n "${graphvizdir}" ] && [ -d "${graphvizdir}" ] ; then
-	sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*graphviz-[0-9]\+\.[0-9]\+\.[0-9]\+% \1${graphvizdir}%g" $l > $l"_"
-	chmod -f --reference=$l $l"_"
-	mv -f $l"_" $l 	
-    fi
+    graphvizdir=`printenv GRAPHVIZHOME`/lib
+    if [ ! -d ${graphvizdir} ] ; then graphvizdir=`printenv GRAPHVIZHOME`/lib ; fi
+    sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*graphviz[^[:space:]]*/lib% \1${graphvizdir}%g" $l > $l"_"
+    chmod -f --reference=$l $l"_"
+    mv -f $l"_" $l 	
 
 fi
 done