diff options
| author | Andras Timar <andras.timar@collabora.com> | 2014-06-03 11:29:52 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-06-11 12:14:51 +0200 |
| commit | 229a7cdac952bbea8263bb24b93a2456fc1a1b51 (patch) | |
| tree | 6d507c92bc2767c9060251e2a8f5f5be8a56e88b /instsetoo_native | |
| parent | 63f4de72939a506c04d7f1b274e9c8fa09c4bb25 (diff) | |
Multilingual Mac OS X DMG for Collabora
Change-Id: Icfa638141e99af3ba313cf235228fbab8b3594d2
(cherry picked from commit 561581cd39022e82a0bc961be7c2406dfb1b94f3)
(cherry picked from commit 32e13ccac64777722a96df47aca868e263db94cd)
Diffstat (limited to 'instsetoo_native')
| -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 0fb97da1486b..bf23eb0e6a06 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 |