diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-06-06 08:30:31 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-06-06 08:44:39 +0300 |
| commit | 47a9bdf32558248940d2466058a4951ff38c7419 (patch) | |
| tree | 642e6642901c1e0d413c2712ff68d2e6b3880de3 /Makefile.in | |
| parent | 4eecf0cdf2e2e0c4c94ee4b3d15d4084bca516b9 (diff) | |
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.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index 6a3c56bc8270..206f5edbb400 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 |