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

[Tor Lillqvist]

 Makefile.in |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 1de07c27647416b7a5e79db03f6e225bbaf5c39b
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sun Feb 23 12:36:42 2014 +0200

    Do install-gdb-printers only on Linux
    
    Change-Id: I07d04826cdfdaf57b43f748104a466049044ac8c

diff --git a/Makefile.in b/Makefile.in
index b1f14f6..08f3909 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -271,7 +271,9 @@ ifeq ($(DISABLE_LINKOO),TRUE)
 ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
 	@macosx-codesign-app-bundle $(DEVINSTALLDIR)/opt/"LibreOffice from Collabora.app"
 endif
+ifeq ($(OS),LINUX)
 	@install-gdb-printers -L
+endif
 else
 	@ooinstall -l $(DEVINSTALLDIR)/opt
 endif
commit 94554b86db23ef112b219ea390d158d954055a3e
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sun Feb 23 12:34:47 2014 +0200

    Hardcode app bundle name here, too
    
    Change-Id: I44a8bd1f16ba28b42c3e3a6244c9a339cd9c721b

diff --git a/Makefile.in b/Makefile.in
index ef8f291..b1f14f6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -269,7 +269,7 @@ else
 ifeq ($(DISABLE_LINKOO),TRUE)
 	@ooinstall $(DEVINSTALLDIR)/opt
 ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
-	@macosx-codesign-app-bundle $(DEVINSTALLDIR)/opt/LibreOffice.app
+	@macosx-codesign-app-bundle $(DEVINSTALLDIR)/opt/"LibreOffice from Collabora.app"
 endif
 	@install-gdb-printers -L
 else
@@ -290,9 +290,9 @@ else ifeq ($(OS),MACOSX)
 	@echo
 	@echo "Developer installation finished, you can now run:"
 	@echo
-	@echo "  open $(BUILDDIR)/install/LibreOffice.app"
+	@echo "  open '$(BUILDDIR)/install/LibreOffice from Collabora.app'"
 	@echo
-	@echo "To debug: gdb install/LibreOffice.app/Contents/MacOS/soffice"
+	@echo "To debug: gdb 'install/LibreOffice from Collabora.app/Contents/MacOS/soffice'"
 endif
 
 dev-install-nocheck: build-nocheck