[Libreoffice-commits] .: Branch 'libreoffice-3-3' - fpicker/source

[Thorsten Behrens]

 fpicker/source/unx/kde/makefile.mk |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit d06c295137b3d787d2d930dc10ef98f984ced72a
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Fri Jan 21 20:49:43 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 b13f9e3374f8f605e6bf6f7be8819142060c37e9)
    
    Signed-off-by: Thorsten Behrens <tbehrens at novell.com>

diff --git a/fpicker/source/unx/kde/makefile.mk b/fpicker/source/unx/kde/makefile.mk
index dcb16d9..b6a8a7c 100644
--- a/fpicker/source/unx/kde/makefile.mk
+++ b/fpicker/source/unx/kde/makefile.mk
@@ -61,10 +61,8 @@ SLOFILES =\
 APP1TARGET=$(TARGET)
 APP1OBJS=$(SLOFILES)
 APP1RPATH=BRAND
-APP1STDLIBS=\
-            $(SALLIB) \
-            $(KDE_LIBS) -lkio -lX11
-
+APP1LINKFLAGS=$(KDE_LIBS) -lkio -lX11
+APP1STDLIBS=$(SALLIB)
 
 .ENDIF # "$(GUIBASE)" != "unx" || "$(ENABLE_KDE)" != "TRUE"