]> SALOME platform Git repositories - tools/install.git/commitdiff
Salome HOME
Update for right deleting -lGL
authormaintenance team <salome-mnt@opencascade.com>
Wed, 12 Nov 2008 14:37:38 +0000 (14:37 +0000)
committermaintenance team <salome-mnt@opencascade.com>
Wed, 12 Nov 2008 14:37:38 +0000 (14:37 +0000)
config_files/CAS-6.3.sh
config_files/qt-3.3.8.sh

index b61405ff21ac9ecbda6fbcc2d3a29ebc544a6f67..b76e7d5cef163168c89525b63c89d52be8270b3c 100755 (executable)
@@ -174,8 +174,7 @@ if [ "$gllibdir" != "" ] ; then
        str_to_replace="-L${gllibdir} -lGL"
     fi
 
-    sed -e "s%-lGLU%%g"                                                         \
-        -e "s%-lGL%%g"                                                         \
+    sed -e "s%-lGL\b%%g"                                                         \
        -e "s%[^[:space:]]*libGL.la[[:space:]]%%g"                             \
        -e "s%^dependency_libs='\(.*\)%dependency_libs='${str_to_replace} \1%" \
        libTKOpenGl.la > libTKOpenGl.la.new
index 3f19fa4958e88d9b64fd1fbd2ca395f4654ca31b..8db56c5d8921f484a28f815d2ec449b0a4ef06b0 100755 (executable)
@@ -176,7 +176,7 @@ mv -f libqt-mt.la.new libqt-mt.la
 has_gl_dep=`grep -E "^dependency_libs=.*-lGL.*" libqt-mt.la`
 gllibdir="`where_gl_libs`"
 if [ "$has_gl_dep" != "" ] && [ "$gllibdir" != "" ] ; then
-    sed -e "s%-lGL%%g" \
+    sed -e "s%-lGL\b%%g" \
        -e "s%^dependency_libs='\(.*\)%dependency_libs='-L$gllibdir -lGL \1%g" \
        libqt-mt.la > libqt-mt.la.new
     mv -f libqt-mt.la.new libqt-mt.la