[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - instsetoo_native/CustomTarget_install.mk

[Andras Timar]

 instsetoo_native/CustomTarget_install.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 87bdefaa8773a52487fe8da9f2a09ee322c2fe71
Author: Andras Timar <andras.timar at collabora.com>
Date:   Tue Oct 29 22:35:37 2013 +0100

    Multilingual Mac OS X DMG for Collabora
    
    Change-Id: Ib10e1df35ac0e12abd0e75261fc7f2fa92eee2e5

diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk
index c8317dc..2558fe2 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -119,7 +119,7 @@ ifeq (ODK,$(filter ODK,$(BUILD_TYPE)))
 	rmdir $(DEVINSTALLDIR)/LibreOffice*_archive_sdk
 endif
 else # LIBO_DEV_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
@@ -130,7 +130,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