[Libreoffice-commits] .: fpicker/source
Lubos Lunak
llunak at kemper.freedesktop.org
Fri Jan 21 11:50:37 PST 2011
fpicker/source/unx/kde/makefile.mk | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit b13f9e3374f8f605e6bf6f7be8819142060c37e9
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.
diff --git a/fpicker/source/unx/kde/makefile.mk b/fpicker/source/unx/kde/makefile.mk
index 5a6d901..e7fbd2b 100644
--- a/fpicker/source/unx/kde/makefile.mk
+++ b/fpicker/source/unx/kde/makefile.mk
@@ -62,10 +62,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"
More information about the Libreoffice-commits
mailing list