[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - Makefile.in

[Tor Lillqvist]

 Makefile.in |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 16f62d80c38f3920a40fc078edecad905ba2b196
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Sep 19 12:47:02 2014 +0300

    Unzip the InfoPlist.strings files into correct locations
    
    Not sure how useful it is to only provide translations for the ODF
    document format names, though.
    
    Change-Id: I22a2e5b896e077ca3067a30635f7cdf67c2f5e7c

diff --git a/Makefile.in b/Makefile.in
index 2aaa297..8fc6f3d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -291,9 +291,15 @@ ifeq ($(OS_FOR_BUILD),WNT)
 else
 	@ooinstall $(TESTINSTALLDIR)
 ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
-# The InfoPlist_*.zip files in "bin" are totally pointless and should
-# not be there. I am too lazy at the moment to figure out how to
-# prevent them from ending up there.
+# Unzip bin/InfoPlist_*.zip files into corresponding Resources/*.lproj directories.
+	set -x; for F in $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin/InfoPlist_*.zip; do \
+		bn=`basename $$F .zip`; \
+		lang=$${bn#InfoPlist_}; \
+		lproj=$(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/Resources/$$lang.lproj; \
+		mkdir $$lproj; \
+		(cd $$lproj; unzip $$F); \
+	done
+# And remove the "bin" folder which should not be there
 	rm -rf $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin
 	@macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app
 endif