Author: pfg
Date: Tue Jan 17 00:43:35 2017
New Revision: 1779124
URL: http://svn.apache.org/viewvc?rev=1779124&view=rev
Log:
KDE: Add the KDE path to KDE_LIBS instead of adding it to SOLARLIB.
Just a small cleanup hinted by the kde4enable branch.
Modified:
openoffice/trunk/main/solenv/inc/unx.mk
Modified: openoffice/trunk/main/solenv/inc/unx.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/unx.mk?rev=1779124&r1=1779123&r2=1779124&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/unx.mk (original)
+++ openoffice/trunk/main/solenv/inc/unx.mk Tue Jan 17 00:43:35 2017
@@ -198,8 +198,7 @@ DLLPOST!:=$(DLLPOST).$($(UNIXVERSIONNAME
.IF "$(ENABLE_KDE)" != ""
.IF "$(KDE_ROOT)"!=""
KDE_CFLAGS:=-I$(KDE_ROOT)/include -DQT_CLEAN_NAMESPACE
-KDE_LIBS:=-lkdeui -lkdecore -lqt-mt
-SOLARLIB+=-L$(KDE_ROOT)/lib
+KDE_LIBS:=-L$(KDE_ROOT)/lib -lkdeui -lkdecore -lqt-mt
.IF "$(OS)$(CPU)" == "LINUXX"
SOLARLIB+=-L$(KDE_ROOT)/lib64
.ENDIF # "$(OS)$(CPU)" == "LINUXX"
