[Libreoffice-commits] .: Branch 'libreoffice-3-3' - vcl/util

[Thorsten Behrens]

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

New commits:
commit e479fe60e9ebefd18b591f48574c0b2424d4321f
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.
    (cherry picked from commit b799041d66f5f5ec944b6baeec43df01fd3ace2c)
    
    Signed-off-by: Thorsten Behrens <tbehrens at novell.com>

diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk
index 983530c..8f2a61a 100644
--- a/vcl/util/makefile.mk
+++ b/vcl/util/makefile.mk
@@ -416,7 +416,7 @@ SHL5STDLIBS+= $(XRANDR_LIBS)
 .ENDIF
 .ENDIF
 
-SHL5STDLIBS+=$(KDE_LIBS)
+SHL5LINKFLAGS+=$(KDE_LIBS)
 
 .ENDIF # "$(ENABLE_KDE)" != ""