[Libreoffice-commits] .: Branch 'libreoffice-3-3' - set_soenv.in

[Jan Holesovsky]

 set_soenv.in |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit e45e52f5a3e2b48e7a3b0a395b0ce444b6fb9828
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Wed Nov 3 15:03:27 2010 +0100

    Don't add an explicit -L/usr/lib or -L/usr/lib64.
    
    It breaks KDE3 build on SUSE.

diff --git a/set_soenv.in b/set_soenv.in
index 1ae3d66..989dff4 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1345,8 +1345,10 @@ elsif ($platform =~ m/linux|netbsd|osf1|aix|freebsd/)
                         $L.$JRELIBDIR.
                         $L.$JRETOOLKITDIR.
                         $L.$JRETHREADDIR.
-                        $L_STLPORT_LIB.
-                        $L.$XLIB;
+                        $L_STLPORT_LIB;
+   if ( $XLIB ne "/usr/lib" && $XLIB ne "/usr/lib64" ) {
+      $SOLARLIB       .= $L.$XLIB;
+   }
 }
 elsif ($platform =~ m/cygwin|os2/)
 {  $SOLARLIB          = $L.'$SOLARVER'.$ds.'$INPATH'.$LIB.