summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2013-10-29 22:35:37 +0100
committerAndras Timar <andras.timar@collabora.com>2013-10-29 22:35:37 +0100
commit87bdefaa8773a52487fe8da9f2a09ee322c2fe71 (patch)
tree4b7e63c8a2c59f088e9551ccaeb2cae7de05e119
parent34f6b1233a996886ca2cc15ab0d66146ca5b4c96 (diff)
Multilingual Mac OS X DMG for Collaboracp-4.1-1
Change-Id: Ib10e1df35ac0e12abd0e75261fc7f2fa92eee2e5
-rw-r--r--instsetoo_native/CustomTarget_install.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk
index c8317dc3acb3..2558fe21d757 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -119,7 +119,7 @@ ifeq (ODK,$(filter ODK,$(BUILD_TYPE)))
rmdir $(DEVINSTALLDIR)/LibreOffice*_archive_sdk
endif
else # LIBO_DEV_INSTALL
- $(call instsetoo_native_install_command,openoffice,$(if $(filter WNT,$(OS)),$(instsetoo_native_WITH_LANG),en-US),,,$(PKGFORMAT))
+ $(call instsetoo_native_install_command,openoffice,$(if $(filter WNT MACOSX,$(OS)),$(instsetoo_native_WITH_LANG),en-US),,,$(PKGFORMAT))
ifeq (ODK,$(filter ODK,$(BUILD_TYPE)))
$(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,$(PKGFORMAT))
endif
@@ -130,7 +130,7 @@ ifeq (HELP,$(filter HELP,$(BUILD_TYPE))$(filter MACOSX,$(OS)))
$(foreach lang,$(gb_HELP_LANGS),\
$(call instsetoo_native_install_command,ooohelppack,$(lang),,-helppack,$(PKGFORMAT)))
endif
-ifneq (WNT,$(OS))
+ifeq (,$(filter WNT MACOSX,$(OS)))
$(foreach lang,$(instsetoo_native_WITH_LANG),\
$(call instsetoo_native_install_command,ooolangpack,$(lang),,-languagepack,$(PKGFORMAT)))
endif