diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-01-09 18:50:58 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-01-10 14:43:30 +0100 |
| commit | ff86a901c4a0c20b8992176126e9274ed895a637 (patch) | |
| tree | a623d610b661625cf41926babd994ca8baff47f8 /solenv | |
| parent | 417943f071cc6c7ebe4dad69dfdec411cc7de975 (diff) | |
dev-install target is used from toplevel Makefile
Change-Id: I5b53046e9389eac2126e910752d131e7b65bf53c
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Module.mk | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk index 2863be8f672c..27f0fde0ce10 100644 --- a/solenv/gbuild/Module.mk +++ b/solenv/gbuild/Module.mk @@ -89,15 +89,15 @@ $(call gb_Module_get_target,%) : mkdir -p $(dir $@) && \ touch $@) -.PHONY : build all clean unitcheck slowcheck subsequentcheck dev-install showmodules translations +.PHONY : build all clean unitcheck slowcheck subsequentcheck showmodules translations .DEFAULT_GOAL := all ifeq ($(strip $(gb_PARTIALBUILD)),) check : subsequentcheck # execute debugrun at the end -ifneq ($(filter dev-install build all,$(MAKECMDGOALS)),) -debugrun :| $(filter dev-install build all,$(MAKECMDGOALS)) +ifneq ($(filter build all,$(MAKECMDGOALS)),) +debugrun :| $(filter build all,$(MAKECMDGOALS)) endif ifneq ($(OS),WNT) @@ -121,20 +121,8 @@ Please consult instsetoo_native/README on installing it. endef endif -define gb_Module_DEVINSTALLHINT - -Developer installation finished, you can now execute: - -on Linux: -make debugrun - -on Mac OS X: -open install/LibreOffice.app - -endef else gb_Module_BUILDHINT= -gb_Module_DEVINSTALLHINT= debugrun :| build endif @@ -179,11 +167,6 @@ check : unitcheck slowcheck debugrun : $(call gb_Module_DEBUGRUNCOMMAND) -dev-install : - @rm -f $(SRCDIR)/install && \ - ln -s $(DEVINSTALLDIR)/opt/ $(SRCDIR)/install - $(info $(gb_Module_DEVINSTALLHINT)) - showmodules : $(info $(strip $(gb_Module_ALLMODULES))) @true |