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

[Tor Lillqvist]

 Makefile.in |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 47a9bdf32558248940d2466058a4951ff38c7419
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Jun 6 08:30:31 2014 +0300

    Revert "test-install doesn't work for OS X and seems unnecessary anyway"
    
    After I reverted the misguided Collabora branding hardcoding it does
    work.
    
    This reverts commit faccaa6fd80480d5fcfe25582951a1f97f2a536d.

diff --git a/Makefile.in b/Makefile.in
index 6a3c56b..206f5ed 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -279,13 +279,10 @@ else
 	@echo "  instdir/program/soffice"
 endif
 	@echo
-ifneq ($(OS),MACOSX)
 	@echo "(only if you have good reason to test an actual installation: make test-install)"
 	@echo
-endif
 	@false
 
-ifneq ($(OS),MACOSX)
 test-install: build
 	@rm -rf $(TESTINSTALLDIR)
 	@mkdir -p $(TESTINSTALLDIR)
@@ -293,9 +290,11 @@ ifeq ($(OS_FOR_BUILD),WNT)
 	cd $(SRCDIR)/instsetoo_native && $(GNUMAKE) LIBO_TEST_INSTALL=TRUE $(GMAKE_OPTIONS)
 else
 	@ooinstall $(TESTINSTALLDIR)
+ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
+	@macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOffice.app
 endif
-	@$(call gb_Top_InstallFinished,Test Installation,$(TESTINSTALLDIR))
 endif
+	@$(call gb_Top_InstallFinished,Test Installation,$(TESTINSTALLDIR))
 
 distro-pack-install: install
 	$(SRCDIR)/bin/distro-install-clean-up