diff options
| author | Andras Timar <andras.timar@collabora.com> | 2014-06-03 11:29:52 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-05-03 22:29:16 +0200 |
| commit | 6e348aa6d1bd5d1c1bacd70f9bcad1a029c5cbad (patch) | |
| tree | 24028d6721ea2495bfd6a543b1a01f558088784d | |
| parent | 1319974cc731804bb33abd30378b34a772c4354b (diff) | |
Multilingual Mac OS X DMG for Collabora
Change-Id: Icfa638141e99af3ba313cf235228fbab8b3594d2
(cherry picked from commit 561581cd39022e82a0bc961be7c2406dfb1b94f3)
| -rw-r--r-- | instsetoo_native/CustomTarget_install.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index 2d6f5370c559..388ef6c57c02 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -111,7 +111,7 @@ ifeq (ODK,$(filter ODK,$(BUILD_TYPE))) rmdir $(TESTINSTALLDIR)/LibreOffice*_archive_sdk endif else # LIBO_TEST_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 @@ -119,7 +119,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 |