[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - Repository.mk

[Miklos Vajna]

 Repository.mk |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 82f96aeb778456dd2f253aaaf626cf4229e1d674
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sun Jun 8 21:46:53 2014 +0200

    gbuild: move vclplug_kde* to the kde section
    
    Change-Id: Ia2b5df76be4d5a376fb28c2460f286e3f2b4acc0
    (cherry picked from commit 4d5de8092404bc82391d6bf98b5389ecc232fda8)

diff --git a/Repository.mk b/Repository.mk
index 700d9f5..9a56d6a 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -209,6 +209,10 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,gnome, \
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,kde, \
 	$(if $(ENABLE_KDE),kdebe1) \
 	$(if $(ENABLE_KDE4),kde4be1) \
+	$(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \
+		$(if $(ENABLE_KDE),vclplug_kde) \
+		$(if $(ENABLE_KDE4),vclplug_kde4) \
+	) \
 ))
 
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,math, \
@@ -366,8 +370,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	$(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \
 		vclplug_gen \
 		$(if $(ENABLE_TDE),vclplug_tde) \
-		$(if $(ENABLE_KDE),vclplug_kde) \
-		$(if $(ENABLE_KDE4),vclplug_kde4) \
 		$(if $(ENABLE_HEADLESS),,vclplug_svp) \
 	) \
 	writerperfect \