summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2014-06-03 11:29:52 +0200
committerAndras Timar <andras.timar@collabora.com>2019-06-15 11:01:56 +0200
commit284fc7749758b4988b49f3581682d296eacb8255 (patch)
tree71f14d7bd536d27603b0a4d7c8ac9aefa206b419
parent44c65f958a5fbcef5520c72fc6a747495e98cc72 (diff)
Multilingual Mac OS X DMG for Collabora
Change-Id: Icfa638141e99af3ba313cf235228fbab8b3594d2 (cherry picked from commit 561581cd39022e82a0bc961be7c2406dfb1b94f3) (cherry picked from commit 32e13ccac64777722a96df47aca868e263db94cd) (cherry picked from commit 229a7cdac952bbea8263bb24b93a2456fc1a1b51)
-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 016fbbd03abd..23c7f591af76 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -113,7 +113,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
@@ -121,7 +121,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