From e78fe7af3961098b72116faf6b95eebb3685670b Mon Sep 17 00:00:00 2001
From: Matúš Kukan <matus.kukan@gmail.com>
Date: Tue, 11 Jun 2013 16:02:34 +0200
Subject: better conditions for registering executables

Change-Id: I197b5e35ee8e7b80f6bba3e59c811ab4261c489c
---
 Repository.mk | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'Repository.mk')

diff --git a/Repository.mk b/Repository.mk
index 42363d166c34..359f8416a592 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -151,16 +151,16 @@ endif
 
 endif
 
-ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
 $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\
-	regmerge \
-	regview \
-	$(if $(and $(SOLAR_JAVA),$(filter-out MACOSX WNT,$(OS))),javaldx) \
+	$(if $(filter-out IOS,$(OS)), \
+		regmerge \
+		regview \
+	) \
+	$(if $(and $(SOLAR_JAVA),$(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),javaldx) \
 ))
 $(eval $(call gb_Helper_register_executables,UREBIN,\
-	uno \
+	$(if $(filter DESKTOP,$(BUILD_TYPE)),uno) \
 ))
-endif
 
 ifeq ($(ENABLE_NPAPI_FROM_BROWSER),YES)
 $(eval $(call gb_Helper_register_executables,OOO,\
-- 
cgit