*** empty log message ***

diff --git a/config_files/CAS-6.2sp3.sh b/config_files/CAS-6.2sp3.sh
index f605de614aad0d18d11802132c5efca42a48b0c8..c2edd1a626509d31823815146e38b87559328238 100755 (executable)
--- a/config_files/CAS-6.2sp3.sh
+++ b/config_files/CAS-6.2sp3.sh
@@ -192,6 +192,7 @@ if [ "$gllibdir" != "" ] ; then
     if [ "$str_to_replace" == "" ] ; then
        str_to_replace="-L${gllibdir} -lGL"
     fi
+
     sed -e "s%-lGL%%g"                                                         \
        -e "s%[^[:space:]]*libGL.la[[:space:]]%%g"                             \
        -e "s%^dependency_libs='\(.*\)%dependency_libs='${str_to_replace} \1%" \
@@ -251,32 +252,41 @@ done
 
 # 2. fix libGL dependencies
 
-if test "$is_mandriva2008" = "1" && test `uname -m` = "x86_64" ; then
-
-echo " +++++++++++ libGL dependencies are not updated"
-
-else
-
-cd $ldir
-gllibdir="`where_gl_libs`"
-if [ "$gllibdir" != "" ] ; then
-    if [ -f ${gllibdir}/libGL.la ] ; then
-       libdir=`grep "libdir=" ${gllibdir}/libGL.la | sed -e "s%libdir='\(.*\)'%\1%"`
-       if [ "`ls $libdir/libGL.so* 2>/dev/null`" ] ; then
-           str_to_replace="${gllibdir}/libGL.la"
-       fi
-    fi
-    if [ "$str_to_replace" == "" ] ; then
-       str_to_replace="-L${gllibdir} -lGL"
+#if test "$is_mandriva2008" = "1" && test `uname -m` = "x86_64" ; then
+
+#echo " +++++++++++ libGL dependencies are not updated"
+
+#else
+
+#cd $ldir
+#gllibdir="`where_gl_libs`"
+#if [ "$gllibdir" != "" ] ; then
+#    if [ -f ${gllibdir}/libGL.la ] ; then
+#      libdir=`grep "libdir=" ${gllibdir}/libGL.la | sed -e "s%libdir='\(.*\)'%\1%"`
+#      if [ "`ls $libdir/libGL.so* 2>/dev/null`" ] ; then
+#          str_to_replace="${gllibdir}/libGL.la"
+#      fi
+#    fi
+#    if [ "$str_to_replace" == "" ] ; then
+#      str_to_replace="-L${gllibdir} -lGL"
+#    fi
+
+    if test `uname -m` = "x86_64" ; then
+    libGLpath=/usr/lib64/libGL.la
+    else
+    libGLpath=/usr/lib/libGL.la
     fi
-    sed -e "s%-lGL%%g"                                                         \
-       -e "s%[^[:space:]]*libGL.la[[:space:]]%%g"                             \
-       -e "s%^dependency_libs='\(.*\)%dependency_libs='${str_to_replace} \1%" \
+       sed -e "s%$libGLpath%""%g" \
        libTKOpenGl.la > libTKOpenGl.la.new
     mv -f libTKOpenGl.la.new libTKOpenGl.la
-fi
 
-fi
+#    sed -e "s%-lGL%%g"                                                         \
+#      -e "s%[^[:space:]]*libGL.la[[:space:]]%%g"                             \
+#      -e "s%^dependency_libs='\(.*\)%dependency_libs='${str_to_replace} \1%" \
+#      libTKOpenGl.la > libTKOpenGl.la.new
+#    mv -f libTKOpenGl.la.new libTKOpenGl.la
+#fi
+#fi
 
 # to generate environment script for sources
 try_preinstalled

diff --git a/config_files/YACS.sh b/config_files/YACS.sh
index 405d3958fdeb8ec097391827f5f0a40517d95aeb..251c7df2adf0dca827559697b97363e508df362b 100755 (executable)
--- a/config_files/YACS.sh
+++ b/config_files/YACS.sh
@@ -39,8 +39,6 @@ fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export YACS_ROOT_DIR=\${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export YACSGui_ROOT_DIR=\${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export YACSGUI_ROOT_DIR=\${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
     export PATH=\${YACS_ROOT_DIR}/bin/salome:\${PATH}

diff --git a/config_files/common.sh b/config_files/common.sh
index a0dd45e21a9592ffc567421fa858a20641726318..d3c7afaf4bf3bd3d0e8494d7666ef3c6e3176c6b 100755 (executable)
--- a/config_files/common.sh
+++ b/config_files/common.sh
@@ -668,7 +668,9 @@ if [ "$l" != "X" ] ; then
        if [ -n "${moddir}" ] ; then
            #echo $l $mod $moddir
 #          sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*${mod}[^[:space:]/]*/\(lib\|lib64\)% \1${moddir}/${myldir}%g" $l > $l"_"
-           sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*${mod}[^[:space:]/]*/lib% \1${moddir}/lib%g" $l > $l"_"
+#          sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*${mod}[^[:space:]/]*/lib% \1${moddir}/lib%g" $l > $l"_"
+           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
        fi
     done
@@ -695,13 +697,16 @@ if [ "$l" != "X" ] ; then
     fi
     # 4. process VTK dependencies
     if test `uname -m` = "x86_64" ; then
-    vtkdir=`printenv VTKHOME`/lib64/vtk
+    vtkdir=`printenv VTKHOME`/lib64/vtk-5.0
+    vtkldir=`printenv VTKHOME`/lib64
     else
-    vtkdir=`printenv VTKHOME`/lib/vtk
+    vtkdir=`printenv VTKHOME`/lib/vtk-5.0
+    vtkldir=`printenv VTKHOME`/lib
     fi
-    if [ -n "${VTKHOME}" ] && [ -d "${vtkdir}" ] ; then
+    if [ -n "${VTKHOME}" ] && [ -d "${vtkdir}" ] && [ -d "${vtkldir}" ] ; then
        # echo $l $VTKHOME $vtkdir
-       sed -e "s%-L[^[:space:]]*VTK[^[:space:]]*/\(lib\|lib64\)/vtk%-L${vtkdir}%g" $l > $l"_"
+       sed -e "s%-L[^[:space:]]*VTK[^[:space:]]*/\(lib\|lib64\)/vtk\-5\.0%-L${vtkdir}%g" \
+           -e "s%-L[^[:space:]]*VTK[^[:space:]]*/\(lib\|lib64\)%-L${vtkldir}%g" $l > $l"_"
        mv -f $l"_" $l
     fi
     # 5. process HDF dependencies
@@ -770,12 +775,13 @@ if [ "$l" != "X" ] ; then
        sed -e "s%-L[^[:space:]]*boost[^[:space:]]*/lib%-L${boostdir}%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}'`
-    moddir=`printenv ${mod}_ROOT_DIR`
-    sed -e "s%^libdir='[^[:space:]]*${mod}[^[:space:]]*/\(lib.*\)'%libdir='${moddir}/\1'%g" $l > $l"_"
-    mv -f $l"_" $l
+
+#    # 14. modify libdir
+#    #sed -e "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib/salome'%g" $l > $l"_"
+#    mod=`basename $ldir | awk -F_ '{print $1}'`
+#    moddir=`printenv ${mod}_ROOT_DIR`
+#    sed -e "s%^libdir='[^[:space:]]*${mod}[^[:space:]]*/\(lib.*\)'%libdir='${moddir}/\1'%g" $l > $l"_"
+#    mv -f $l"_" $l
 
     # 15. process libxml dependencies
     libxmldir=`printenv LIBXML_DIR`/lib
@@ -796,6 +802,15 @@ if [ "$l" != "X" ] ; then
     sed    -e "s%-L[^[:space:]]*scotch[^[:space:]]*/bin%-L${scotchdir}%g" $l > $l"_"
     mv -f $l"_" $l     
 
+    # 4. process libGL.la dependencies
+    if test `uname -m` = "x86_64" ; then
+    libGLpath=/usr/lib64/libGL.la
+    else
+    libGLpath=/usr/lib/libGL.la
+    fi
+       sed -e "s%$libGLpath%""%g" $l > $l"_"
+       mv -f $l"_" $l
+
 
 fi
 done