Repository.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
New commits: commit e78fe7af3961098b72116faf6b95eebb3685670b Author: Matúš Kukan <[email protected]> Date: Tue Jun 11 16:02:34 2013 +0200 better conditions for registering executables Change-Id: I197b5e35ee8e7b80f6bba3e59c811ab4261c489c diff --git a/Repository.mk b/Repository.mk index 42363d1..359f841 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,\
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
