Small updates

diff --git a/config_files/build.csh b/config_files/build.csh
index 03c0cc66998dcdf9bdbbd47e9ae869bdae78be61..fe5ee5eda98b29d338b79a4c83391dbc4ba50a53 100755 (executable)
--- a/config_files/build.csh
+++ b/config_files/build.csh
@@ -303,6 +303,9 @@ foreach module (${modules})
     if ( ! -e ${module_src}/${cfg_file} ) then
        set cfg_file=configure.in.base
        set vx=`grep -e "^VERSION=" ${module_src}/${cfg_file} | awk -F= '{ if (NF>1) print $NF; }' | tr -d '[:space:]'`
+       if ( "$vx" == "" ) then
+           set vx=`grep -e "^AC_INIT" ${module_src}/${cfg_file} | sed -e "s%.*\[\([[:digit:].]*\)\].*%\1%g"`
+       endif
        else
        set vx=`grep -e "^AC_INIT" ${module_src}/${cfg_file} | sed -e "s%.*\[\([[:digit:].]*\)\].*%\1%g"`       
     endif

diff --git a/config_files/build.sh b/config_files/build.sh
index 4e408d9faa385342f949967c06aabf93ed0a56dc..af4e3daf49dd638c72fefe4e9c88880bdfa9b16d 100755 (executable)
--- a/config_files/build.sh
+++ b/config_files/build.sh
@@ -310,7 +310,10 @@ for module in ${modules}; do
        if [ ! -e ${module_src}/${cfg_file} ] ; then
            cfg_file=configure.in.base
            vx=`grep -e "^VERSION=" ${module_src}/${cfg_file} | awk -F= '{ if (NF>1) print $NF; }' | tr -d '[:space:]'`
-           else
+           if [ "$vx" == "" ] ; then
+               vx=`grep -e "^AC_INIT" ${module_src}/${cfg_file} | sed -e "s%.*\[\([[:digit:].]*\)\].*%\1%g"`
+           fi
+       else
            vx=`grep -e "^AC_INIT" ${module_src}/${cfg_file} | sed -e "s%.*\[\([[:digit:].]*\)\].*%\1%g"`
        fi
        px=${BUILD_DIR}/${module}

diff --git a/config_files/common.sh b/config_files/common.sh
index d3c7afaf4bf3bd3d0e8494d7666ef3c6e3176c6b..5694d9892581e6c32917f6fabd2643cce5b9803e 100755 (executable)
--- a/config_files/common.sh
+++ b/config_files/common.sh
@@ -672,6 +672,10 @@ if [ "$l" != "X" ] ; then
            sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*${mod}[^[:space:]/]*/lib% \1${moddir}/lib%g" \
                -e "s%^libdir='[^[:space:]]*${mod}[^[:space:]]*/\(lib.*\)'%libdir='${moddir}/\1'%g" $l > $l"_"
            mv -f $l"_" $l
+           for mod1 in $SALOME_MODULES; do
+               sed     -e "s%[[:space:]]\(-L\)\?[^[:space:]]*${mod1}[^[:space:]]*/${mod1}_build%%g" $l > $l"_"
+               mv -f $l"_" $l
+           done
        fi
     done
 
@@ -776,6 +780,13 @@ if [ "$l" != "X" ] ; then
        mv -f $l"_" $l
     fi
 
+    blsurfdir=`printenv BLSURFHOME`/lib
+    if [ -n "${blsurfdir}" ] && [ -d "${blsurfdir}" ] ; then
+       # echo $l $BOOSTDIR $boostdir
+       sed -e "s%-L[^[:space:]]*blsurf[^[:space:]]*/lib%-L${blsurfdir}%g" $l > $l"_"
+       mv -f $l"_" $l
+    fi
+
 #    # 14. modify libdir
 #    #sed -e "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib/salome'%g" $l > $l"_"
 #    mod=`basename $ldir | awk -F_ '{print $1}'`