distro-configs/CPOSX.conf | 5 +++--
instsetoo_native/CustomTarget_install.mk | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 72c366ec2031d7de09428d38361c417008ee5a45
Author: Andras Timar <andras.ti...@collabora.com>
Date: Tue Jun 3 11:29:52 2014 +0200
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
diff --git a/distro-configs/CPOSX.conf b/distro-configs/CPOSX.conf
index 2e31ca8..3413d6c 100644
--- a/distro-configs/CPOSX.conf
+++ b/distro-configs/CPOSX.conf
@@ -3,6 +3,7 @@
--without-junit
--with-help
--with-helppack-integration
+--with-myspell-dicts
--enable-extension-integration
--disable-online-update
--disable-odk
@@ -14,7 +15,7 @@
--enable-ext-nlpsolver
--enable-ext-numbertext
--enable-ext-ct2n
---enable-ext-google-docs
--enable-ext-languagetool
--enable-release-build
---with-lang=ar as ast bg bn-IN br ca ca-valencia cy cs da de en-US en-GB es et
eu fi fr ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn oc
or pa-IN pl pt pt-BR ro ru sk sl sr sv ta te tr uk vi zh-CN zh-TW
+--with-package-format=dmg
+--with-lang=ar as ast bg bn-IN br ca ca-valencia cy cs da de el en-US en-GB es
et eu fi fr ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn
oc or pa-IN pl pt pt-BR ro ru sk sl sr sr-Latn sv ta te tr uk vi zh-CN zh-TW
diff --git a/instsetoo_native/CustomTarget_install.mk
b/instsetoo_native/CustomTarget_install.mk
index ea03413..3febfad 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
