diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-11-29 13:25:34 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-11-29 17:25:13 +0100 |
| commit | 912ad68d34488f81753ab50ef7a892a3b20161b1 (patch) | |
| tree | f50d6a3f33200cca52f8291f82a0f988a81ad643 | |
| parent | 37f509e15d74e005cbe264dd27106359c4165657 (diff) | |
move install target to gbuild
| -rw-r--r-- | Makefile.in | 9 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/post_AuxTargets.mk | 9 |
2 files changed, 10 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in index 2df186372207..2a1407eb9c66 100644 --- a/Makefile.in +++ b/Makefile.in @@ -64,13 +64,8 @@ fetch: unitcheck: @$(call forward_to_gbuild,$@) -install: build - @. ./Env.Host.sh && \ - echo "Installing in @INSTALLDIR@..." && \ - ooinstall "@INSTALLDIR@" && \ - echo "" && \ - echo "Installation finished, you can now execute:" && \ - echo "@INSTALLDIR@/program/soffice" +install: + @$(call forward_to_gbuild,$@) ifeq ($(filter clean distclean,$(MAKECMDGOALS)),) Makefile: autogen.lastrun configure.in ooo.lst.in set_soenv.in Makefile.in diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk index fcdf2f41c660..c137fb013684 100644 --- a/solenv/gbuild/extensions/post_AuxTargets.mk +++ b/solenv/gbuild/extensions/post_AuxTargets.mk @@ -25,7 +25,7 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -.PHONY: id tags docs distro-pack-install fetch clean-host clean-build bootstrap +.PHONY: id tags docs distro-pack-install install fetch clean-host clean-build bootstrap id: @create-ids @@ -72,6 +72,13 @@ distclean: clean desktop/scripts/soffice.sh ooo.lst post_download post_download.log \ set_soenv set_soenv.last set_soenv.stamp src.downloaded warn +install: build + echo "Installing in $(INSTALLDIR)..." && \ + ooinstall "$(INSTALLDIR)" && \ + echo "" && \ + echo "Installation finished, you can now execute:" && \ + echo "$(INSTALLDIR)/program/soffice" + endif |