[Libreoffice-commits] .: vcl/util

Lubos Lunak llunak at kemper.freedesktop.org
Fri Jan 21 11:48:33 PST 2011


 vcl/util/makefile.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b799041d66f5f5ec944b6baeec43df01fd3ace2c
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Fri Jan 21 20:44:45 2011 +0100

    fix KDE3 library search order (fdo#32797)
    
    Use LINKFLAGS instead of STDLIBS, as the latter comes way too late
    in the link command and may result in some stray -L/usr/lib getting
    before -L$KDEDIR/lib. Since KDE4 libs often tend to be installed
    under /usr while KDE3 libs are often somewhere else such as /opt/kde3/lib,
    this could cause using wrong libraries.

diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk
index 346a195..76137c5 100755
--- a/vcl/util/makefile.mk
+++ b/vcl/util/makefile.mk
@@ -417,7 +417,7 @@ SHL5STDLIBS+= $(XRANDR_LIBS)
 .ENDIF
 .ENDIF
 
-SHL5STDLIBS+=$(KDE_LIBS)
+SHL5LINKFLAGS+=$(KDE_LIBS)
 
 .ENDIF # "$(ENABLE_KDE)" != ""
 


More information about the Libreoffice-commits mailing list