From: maintenance team <salome-mnt@opencascade.com>
Date: Wed, 12 Nov 2008 14:37:38 +0000 (+0000)
Subject: Update for right deleting -lGL
X-Git-Tag: V4_1_4~33
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=bf1507b4873b53aa3e1c14e0d93f4ff2cf860b2a;p=tools%2Finstall.git

Update for right deleting -lGL
---

diff --git a/config_files/CAS-6.3.sh b/config_files/CAS-6.3.sh
index b61405f..b76e7d5 100755
--- a/config_files/CAS-6.3.sh
+++ b/config_files/CAS-6.3.sh
@@ -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
diff --git a/config_files/qt-3.3.8.sh b/config_files/qt-3.3.8.sh
index 3f19fa4..8db56c5 100755
--- a/config_files/qt-3.3.8.sh
+++ b/config_files/qt-3.3.8.sh
@@ -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