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

[Andras Timar]

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

New commits:
commit 6e348aa6d1bd5d1c1bacd70f9bcad1a029c5cbad
Author: Andras Timar <andras.timar at collabora.com>
Date:   Tue Jun 3 11:29:52 2014 +0200

    Multilingual Mac OS X DMG for Collabora
    
    Change-Id: Icfa638141e99af3ba313cf235228fbab8b3594d2
    (cherry picked from commit 561581cd39022e82a0bc961be7c2406dfb1b94f3)

diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk
index 2d6f537..388ef6c 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