Fix a problem with *.la files caused by modifications in KERNEL module compilation...

diff --git a/config_files/common.sh b/config_files/common.sh
index a2d877c65d738093fa43d97d07883b3e98aba640..9c38ddbaa7425de37d4b039c5704fd10821ef2df 100755 (executable)
--- a/config_files/common.sh
+++ b/config_files/common.sh
@@ -493,18 +493,20 @@ srcdir=`pwd`
 SALOME_MODULES="`env | awk -F_ '/[[:alnum:]]*_ROOT_DIR/ { print $1 }'`"
 
 cd $ldir
-la_files=`find . -name "*.la" -maxdepth 1`
+la_files=`find . -name "*.la"`
 
 for l in X ${la_files}; do
 if [ "$l" != "X" ] ; then
+    d=`dirname $l`
     l=`basename $l`
+    cd $ldir; cd $d
     # 1. process salome modules dependencies
     for mod in $SALOME_MODULES; do
        moddir=`printenv ${mod}_ROOT_DIR`
        if [ -n "${moddir}" ] ; then
            #echo $l $mod $moddir
-           sed -e "s%-L[^[:space:]]*${mod}[^[:space:]]*/lib/salome%-L${moddir}/lib/salome%g" $l > _$l
-           mv -f _$l $l
+           sed -e "s%\(-L\|[[:space:]]\)[^[:space:]]*${mod}[^[:space:]]*/lib%\1${moddir}/lib%g" $l > $l"_"
+           mv -f $l"_" $l
        fi
     done
     # 2. process CAS.CADE dependencies
@@ -513,51 +515,51 @@ if [ "$l" != "X" ] ; then
     if [ ! -d ${casdir} ] ; then casdir=`printenv CASROOT`/lin/lib ; fi
     if [ -n "${CASROOT}" ] && [ -d "${casdir}" ] ; then
        # echo $l $CASROOT $casdir
-       sed -e "s%-L[^[:space:]]*\(OCT\|CAS\)[^[:space:]]*%-L${casdir}%g" $l > _$l
-       mv -f _$l $l
+       sed -e "s%-L[^[:space:]]*\(OCT\|CAS\)[^[:space:]]*%-L${casdir}%g" $l > $l"_"
+       mv -f $l"_" $l
     fi
     # 3. process omniORB dependencies
     omnidir=`printenv OMNIORBDIR`/lib/i586_linux_2.0_glibc2.1
     if [ ! -d ${omnidir} ] ; then omnidir=`printenv OMNIORBDIR`/lib ; fi
     if [ -n "${OMNIORBDIR}" ] && [ -d "${omnidir}" ] ; then
        # echo $l $OMNIORBDIR $omnidir
-       sed -e "s%-L[^[:space:]]*omni[^[:space:]]*%-L${omnidir}%g" $l > _$l
-       mv -f _$l $l
+       sed -e "s%-L[^[:space:]]*omni[^[:space:]]*%-L${omnidir}%g" $l > $l"_"
+       mv -f $l"_" $l
     fi
     # 4. process VTK dependencies
     vtkdir=`printenv VTKHOME`/lib/vtk
     if [ -n "${VTKHOME}" ] && [ -d "${vtkdir}" ] ; then
        # echo $l $VTKHOME $vtkdir
-       sed -e "s%-L[^[:space:]]*VTK[^[:space:]]*/lib/vtk%-L${vtkdir}%g" $l > _$l
-       mv -f _$l $l
+       sed -e "s%-L[^[:space:]]*VTK[^[:space:]]*/lib/vtk%-L${vtkdir}%g" $l > $l"_"
+       mv -f $l"_" $l
     fi
     # 5. process HDF dependencies
     hdfdir=`printenv HDF5HOME`/lib
     if [ -n "${HDF5HOME}" ] && [ -d "${hdfdir}" ] ; then
        # echo $l $HDF5HOME $hdfdir
-       sed -e "s%-L[^[:space:]]*hdf[^[:space:]]*/lib%-L${hdfdir}%g" $l > _$l
-       mv -f _$l $l
+       sed -e "s%-L[^[:space:]]*hdf[^[:space:]]*/lib%-L${hdfdir}%g" $l > $l"_"
+       mv -f $l"_" $l
     fi
     # 6. process MED dependencies
     meddir=`printenv MED2HOME`/lib
     if [ -n "${MED2HOME}" ] && [ -d "${meddir}" ] ; then
        # echo $l $MED2HOME $meddir
-       sed -e "s%-L[^[:space:]]*med[^[:space:]]*/lib%-L${meddir}%g" $l > _$l
-       mv -f _$l $l
+       sed -e "s%-L[^[:space:]]*med[^[:space:]]*/lib%-L${meddir}%g" $l > $l"_"
+       mv -f $l"_" $l
     fi
     # 7. process qwt dependencies
     qwtdir=`find_in_path libqwt.so ${LD_LIBRARY_PATH}`
     if [ -n "${qwtdir}" ] && [ -d "${qwtdir}" ] ; then
        # echo $l $qwtdir
-       sed -e "s%-L[^[:space:]]*qwt[^[:space:]]*/lib%-L${qwtdir}%g" $l > _$l
-       mv -f _$l $l
+       sed -e "s%-L[^[:space:]]*qwt[^[:space:]]*/lib%-L${qwtdir}%g" $l > $l"_"
+       mv -f $l"_" $l
     fi
     # 8. process qt dependencies
     qtdir=`printenv QTDIR`/lib
     if [ -n "${QTDIR}" ] && [ -d "${qtdir}" ] ; then
        # echo $l $QTDIR $qtdir
-       sed -e "s%-L[^[:space:]]*qt[^[:space:]]*/lib%-L${qtdir}%g" $l > _$l
-       mv -f _$l $l
+       sed -e "s%-L[^[:space:]]*qt[^[:space:]]*/lib%-L${qtdir}%g" $l > $l"_"
+       mv -f $l"_" $l
     fi
     # 9. process python dependencies
     where_python=`which python`                 # e.g. /usr/bin/python
@@ -566,33 +568,34 @@ if [ "$l" != "X" ] ; then
         where_python=`dirname $where_python`    # --> /usr
        python_version=`python -c "import sys; print sys.version[:3]"`
        # echo $l $where_python $python_version
-       sed -e "s%-L[^[:space:]]*python[0-9]\.[0-9]\([^[:space:]]*\)%-L${where_python}/lib/python${python_version}\1%g" $l > _$l
-       mv -f _$l $l
+       sed -e "s%-L[^[:space:]]*python[0-9]\.[0-9]\([^[:space:]]*\)%-L${where_python}/lib/python${python_version}\1%g" $l > $l"_"
+       mv -f $l"_" $l
     fi
     # 10. process sip dependencies
     sipdir=`find_in_path sip.so ${LD_LIBRARY_PATH}`
     if [ -n "${sipdir}" ] && [ -d "${sipdir}" ] ; then
        # echo $l $sipdir
-       sed -e "s%-L[^[:space:]]*sip[^[:space:]]*%-L${sipdir}%g" $l > _$l
-       mv -f _$l $l
+       sed -e "s%-L[^[:space:]]*sip[^[:space:]]*%-L${sipdir}%g" $l > $l"_"
+       mv -f $l"_" $l
     fi
     # 11. process PyQt dependencies
     pyqtdir=`find_in_path qt.so ${LD_LIBRARY_PATH}`
     if [ -n "${pyqtdir}" ] && [ -d "${pyqtdir}" ] ; then
        # echo $l $pyqtdir
-       sed -e "s%-L[^[:space:]]*PyQt[^[:space:]]*%-L${pyqtdir}%g" $l > _$l
-       mv -f _$l $l
+       sed -e "s%-L[^[:space:]]*PyQt[^[:space:]]*%-L${pyqtdir}%g" $l > $l"_"
+       mv -f $l"_" $l
     fi
     # 12. process tcl/tk dependencies
     tcldir=`printenv TCLHOME`/lib
     if [ -n "${tcldir}" ] && [ -d "${tcldir}" ] ; then
        # echo $l $TCLHOME $tcldir
-       sed -e "s%-L[^[:space:]]*tcltk[^[:space:]]*/lib%-L${tcldir}%g" $l > _$l
-       mv -f _$l $l
+       sed -e "s%-L[^[:space:]]*tcltk[^[:space:]]*/lib%-L${tcldir}%g" $l > $l"_"
+       mv -f $l"_" $l
     fi
     # 13. modify libdir
-    sed -e "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib/salome'%g" $l > _$l
-    mv -f _$l $l
+    #sed -e "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib/salome'%g" $l > $l"_"
+    sed -e "s%^libdir='[^[:space:]]*${mod}[^[:space:]]*/\(lib.*\)'%libdir='${moddir}/\1'%g" $l > $l"_"
+    mv -f $l"_" $l
 fi
 done