From: inv <inv@opencascade.com>
Date: Mon, 14 Nov 2011 14:44:19 +0000 (+0000)
Subject: Update
X-Git-Tag: V6_4_0~21
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=eb72d76c8182e751c209eb2fabd4639ee93c1198;p=tools%2Finstall.git

Update
---

diff --git a/config_files/common.sh b/config_files/common.sh
index b32cec2..30bdf48 100755
--- a/config_files/common.sh
+++ b/config_files/common.sh
@@ -664,7 +664,6 @@ if [ -z "$ldir" ] || [ ! -d "$ldir" ]; then return 1; fi
 
 srcdir=`pwd`
 
-#SALOME_MODULES="`env | awk -F_ '/[[:alnum:]]*_ROOT_DIR/ { print $1 }'`"
 SALOME_MODULES="`env | awk -F_ '/[a-zA-Z0-9]*_ROOT_DIR/ { print $1 }'`"
 
 cd $ldir
@@ -903,14 +902,21 @@ if [ "$l" != "X" ] ; then
     # . process freetype dependencies
     freetypedir=`printenv FREETYPEDIR`/lib
     if [ ! -d ${freetypedir} ] ; then freetypedir=`printenv FREETYPEDIR`/lib ; fi
-    sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*freetype-[0-9]\.[0-9]\+\.[0-9]/lib% \1${freetypedir}%g" $l > $l"_"
+    sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*freetype[^[:space:]]*/lib% \1${freetypedir}%g" $l > $l"_"
     chmod -f --reference=$l $l"_"
     mv -f $l"_" $l 
 
     # . process  ftgl dependencies
     ftgldir=`printenv FTGLDIR`/lib
     if [ ! -d ${ftgldir} ] ; then ftgldir=`printenv FTGLDIR`/lib ; fi
-    sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*ftgl-[0-9]\.[0-9]\+\.[0-9]/lib% \1${ftgldir}%g" $l > $l"_"
+    sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*ftgl[^[:space:]]*/lib% \1${ftgldir}%g" $l > $l"_"
+    chmod -f --reference=$l $l"_"
+    mv -f $l"_" $l 
+ 
+    # . process  ftgl dependencies
+    ftgldir=`printenv TBBHOME`/lib
+    if [ ! -d ${ftgldir} ] ; then ftgldir=`printenv FTGLDIR`/lib ; fi
+    sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*ftgl[^[:space:]]*/lib% \1${ftgldir}%g" $l > $l"_"
     chmod -f --reference=$l $l"_"
     mv -f $l"_" $l 
 
diff --git a/config_files/docutils-0.7.0.sh b/config_files/docutils-0.7.0.sh
index c3e2396..28d4049 100755
--- a/config_files/docutils-0.7.0.sh
+++ b/config_files/docutils-0.7.0.sh
@@ -69,7 +69,7 @@ install_source
 
 # build sources
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-cd ${PRODUCT_SRC_DIR} ; python setup.py install --prefix=${PRODUCT_DIR}
+cd ${PRODUCT_SRC_DIR} ; check_job ${PRODUCT_DIR}/BUILD.LOG python setup.py install --prefix=${PRODUCT_DIR}
 
 cd ${PRODUCT_DIR}/bin; 
 
diff --git a/config_files/freetype-2.3.7.sh b/config_files/freetype-2.3.7.sh
index 8618560..9993c87 100755
--- a/config_files/freetype-2.3.7.sh
+++ b/config_files/freetype-2.3.7.sh
@@ -116,6 +116,7 @@ check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
 
 ### modifing la files
 cd ${PRODUCT_DIR}/lib
+sed -i "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g;" libfreetype.la
 
 # to generate environment script for sources
 try_preinstalled
diff --git a/config_files/ftgl-2.1.2.sh b/config_files/ftgl-2.1.2.sh
index a119fb3..093c5c4 100755
--- a/config_files/ftgl-2.1.2.sh
+++ b/config_files/ftgl-2.1.2.sh
@@ -123,6 +123,16 @@ check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
 
 ### modifing la files
 cd ${PRODUCT_DIR}/lib
+sed -e 's%\(.*\)\([[:space:]].*libfreetype.la\)\(.*\)%\1 -lfreetype\3%g' \
+    -e "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" libftgl.la > libftgl.la.new
+mv -f libftgl.la.new libftgl.la
+
+tmp=""
+if [ -n "${FREETYPEDIR}" ]; then
+    tmp="-L${FREETYPEDIR}/lib"
+fi
+sed -e "s%\(.*\)\([[:space:]].*-L.*/freetype-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" libftgl.la > libftgl.la.new
+mv -f libftgl.la.new libftgl.la
 
 # to generate environment script for sources
 try_preinstalled