clean up echo deserts, consolidate blurbs

Change-Id: If268d37e8e96adcb8902c8b3fc855ecddea69ba5
This commit is contained in:
Bjoern Michaelsen 2013-11-20 19:36:03 +01:00
parent 60c64b437c
commit ac32aafc7b

View file

@ -249,31 +249,47 @@ build-nocheck check debugrun help slowcheck translations unitcheck subsequentche
cross-toolset: bootstrap fetch
$(GNUMAKE) gb_Side=build -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild build-tools
ifneq ($(OS),MACOSX)
#
# Install
#
install:
echo "Installing in $(INSTALLDIR)..." && \
ooinstall "$(INSTALLDIR)" && \
define gb_Top_DoInstall
echo "$(1) in $(INSTALLDIR) ..." && \
ooinstall $(2) "$(INSTALLDIR)"
endef
ifneq ($(OS),MACOSX)
define gb_Top_InstallFinished
echo && echo "If you want to edit the .ui files with glade first execute:" && \
echo && echo "export GLADE_CATALOG_SEARCH_PATH=$(2)/share/glade" && \
echo && echo "$(1) finished, you can now execute:" && \
echo "$(2)/program/soffice"
endef
else
define gb_Top_InstallFinished
echo && echo "$(1) finished, you can now run: " && \
echo "open $(2)/$(PRODUCTNAME).app" && \
echo "" && \
echo "Installation finished, you can now execute:" && \
echo "$(INSTALLDIR)/program/soffice"
echo "To debug: gdb $(2)/$(PRODUCTNAME).app/Contents/MacOS/soffice"
endef
endif
ifneq ($(OS),MACOSX)
install:
@$(call gb_Top_DoInstall,Installing,)
@$(call gb_Top_InstallFinished,Installation,$(INSTALLDIR))
install-strip:
echo "Installing and stripping binaries in $(INSTALLDIR)..." && \
ooinstall --strip "$(INSTALLDIR)" && \
echo "" && \
echo "Installation finished, you can now execute:" && \
echo "$(INSTALLDIR)/program/soffice"
@$(call gb_Top_DoInstall,Installing and stripping binaries,--strip)
@$(call gb_Top_InstallFinished,Installation,$(INSTALLDIR))
endif # !MACOSX
dev-install:
@echo
@echo "dev-install is obsolete! Just build with \"make check\" and run"
@echo && echo "dev-install is obsolete! Just build with \"make check\" and run"
ifeq ($(OS),MACOSX)
@echo " open instdir/$(PRODUCTNAME).app"
@echo
@ -300,23 +316,7 @@ ifneq ($(OS),MACOSX)
@install-gdb-printers -L
endif
endif
@echo
@echo "If you want to edit the .ui files with glade first execute:"
@echo
@echo "export GLADE_CATALOG_SEARCH_PATH=$(TESTINSTALLDIR)/share/glade"
ifneq ($(OS),MACOSX)
@echo
@echo "Test installation finished, you can now execute:"
@echo
@echo " $(TESTINSTALLDIR)/program/soffice"
else
@echo
@echo "Test installation finished, you can now run:"
@echo
@echo " open $(TESTINSTALLDIR)/LibreOffice.app"
@echo
@echo "To debug: gdb $(TESTINSTALLDIR)/LibreOffice.app/Contents/MacOS/soffice"
endif
@$(call gb_Top_InstallFinished,Test Installation,$(TESTINSTALLDIR))
distro-pack-install: install
$(SRCDIR)/bin/distro-install-clean-up