diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-06-11 16:02:34 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-06-11 16:03:06 +0200 |
| commit | e78fe7af3961098b72116faf6b95eebb3685670b (patch) | |
| tree | e9cbefe3012882357d019bade3d02b8df7a31509 /Repository.mk | |
| parent | d330f3a2712b38c382767f668e751128b541624c (diff) | |
better conditions for registering executables
Change-Id: I197b5e35ee8e7b80f6bba3e59c811ab4261c489c
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 12 |
1 files changed, 6 insertions, 6 deletions
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,\ |