[Libreoffice-commits] core.git: Makefile.in

[Tor Lillqvist]

 Makefile.in |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit f345a2c52af0333b46b4b74e686883c8cb9ffab4
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Sep 15 21:50:35 2014 +0300

    We don't want those bin/InfoPlist_*.zip files in the app bundle
    
    (cherry picked from commit 7956d38fa3c0db77b9b2b41f870bd3587e3dc1af)
    
    Conflicts:
    	Makefile.in
    
    Change-Id: I29eefa599f175d98303fca8f5ccf1c8fe85b0bbc
    (cherry picked from commit b21140e2de219cd97cae5b7b9b988e1fd70da029)
    Reviewed-on: https://gerrit.libreoffice.org/22860
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/Makefile.in b/Makefile.in
index d9aef81..686f647 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -306,6 +306,10 @@ ifeq ($(OS_FOR_BUILD),WNT)
 else
 	@$(SRCDIR)/solenv/bin/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.
+	rm -rf $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin
 	@$(SRCDIR)/solenv/bin/macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app
 endif
 endif