*** empty log message ***

[tools/install.git] / config_files / common.sh

diff --git a/config_files/common.sh b/config_files/common.sh
index 06a61310ca9e966ce51f8c17d8dac095667528fb..beaff54802a6d67c74eba7334e0448261b98ea3a 100755 (executable)
--- a/config_files/common.sh
+++ b/config_files/common.sh
@@ -19,7 +19,7 @@ export CSHRC="salome.csh"
 #####################################################
 # !WARNING! This is current SALOME version number 
 ####################################################
-export SALOME_VERSION="5.1.1"
+export SALOME_VERSION="5.1.2"
 
 # Name of the single directory for SALOME modules
 export SDIR_NAME="SALOME_${SALOME_VERSION}"
@@ -692,6 +692,9 @@ if [ "$l" != "X" ] ; then
            -e "s%[[:space:]]\(-L\)\?[^[:space:]]*\(OCT\|CAS\)[^[:space:]/]*/lin/lib% \1${casdir}%g"   \
            -e "s%[[:space:]]\(-L\)\?[^[:space:]]*\(OCT\|CAS\)[^[:space:]/]*/lib% \1${casdir}%g" $l > $l"_"
        mv -f $l"_" $l
+       sed -e "s%-L[^[:space:]]*OCCT[^[:space:]]*/Linux/lib%-L${casdir}%g" \
+           -e "s%[^[:space:]]*OCCT[^[:space:]]*/lib/%${casdir}/%g" $l > $l"_"
+       mv -f $l"_" $l
     fi
     # 3. process omniORB dependencies
     omnidir=`printenv OMNIORBDIR`/lib/i586_linux_2.0_glibc2.1
@@ -832,7 +835,15 @@ if [ "$l" != "X" ] ; then
     # 19. process graphviz dependencies
     graphvizdir=`printenv GRAPHVIZHOME`/lib
     if [ ! -d ${graphvizdir} ] ; then graphvizdir=`printenv GRAPHVIZHOME`/lib ; fi
-    sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*graphviz-[0-9]\.[0-9]\+\.[0-9]/lib% \1${graphvizdir}%g" $l > $l"_"
+    sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*graphviz-[0-9]\.[0-9]\+\.[0-9]/lib% \1${graphvizdir}%g" \
+       -e "s%[[:space:]]\(-L\)\?[^[:space:]]*graphviz/lib% \1${graphvizdir}%g" $l > $l"_"
+    chmod -f --reference=$l $l"_"
+    mv -f $l"_" $l     
+ 
+   # 20. process QScintilla-2.3 dependencies
+    qscintilladir=`printenv QSCINTILLA_DIR`/lib
+    if [ ! -d ${qscintilladir} ] ; then qscintilladir=`printenv QSCINTILLA_DIR`/lib ; fi
+    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