diff options
| author | Andras Timar <andras.timar@collabora.com> | 2014-06-03 11:29:52 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-06-05 14:06:59 +0200 |
| commit | 72c366ec2031d7de09428d38361c417008ee5a45 (patch) | |
| tree | 3bed61d1465a39ac468ed367a23a7811e8b229e4 /instsetoo_native | |
| parent | e8d629dc06ef79d5db1c80af1b1047f4fcb216b7 (diff) | |
LibreOffice from Collabora OS X
CPOSX.conf: --with-package-format=dmg
CPOSX.conf: re-add 'el'
CPOSX.conf: re-add 'sr-Latn' and myspell dicts
Multilingual Mac OS X DMG for Collabora
Change-Id: Icfa638141e99af3ba313cf235228fbab8b3594d2
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 ea0341391bf2..3febfadc114c 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -110,7 +110,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 @@ -118,7 +118,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 |