diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-12-01 10:47:46 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-12-01 11:14:57 +0100 |
| commit | e8e2d82894c059ad16c805acdf3182e0bc57d04d (patch) | |
| tree | 6a6ae93d83a14cc104db222a9628cf19899fe4db | |
| parent | c869898b1d064c548760ce1bca9affb56f223888 (diff) | |
Makefile.in: Introduce the 'install' target.
You can use it like 'make install', or 'make install prefix=/path', to override
what has been set by ./configure.
| -rw-r--r-- | Makefile.in | 27 | ||||
| -rw-r--r-- | set_soenv.in | 3 |
2 files changed, 21 insertions, 9 deletions
diff --git a/Makefile.in b/Makefile.in index 8b2874911..8eb3d31d2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -3,19 +3,18 @@ SHELL=/bin/sh -all: +all: dmake/dmake@EXEEXT@ @. ./*[Ee]nv.[Ss]et.sh && \ - ./bootstrap && \ cd instsetoo_native && \ ../solenv/bin/build.pl -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ -distclean: +install: @. ./*[Ee]nv.[Ss]et.sh && \ - dmake distclean - -clean: - @. ./*[Ee]nv.[Ss]et.sh && \ - dmake clean + echo "Installing in $${prefix:-@prefix@}..." + ooinstall "$${prefix:-@prefix@}" && \ + echo "" && \ + echo "Installation finished, you can now execute:" && \ + echo "$${prefix:-@prefix@}/program/soffice" dev-install: @. ./*[Ee]nv.[Ss]et.sh && \ @@ -23,3 +22,15 @@ dev-install: echo "" && \ echo "Developer installation finished, you can now execute:" && \ echo "@abs_builddir@/install/program/soffice" + +distclean: dmake/dmake@EXEEXT@ + @. ./*[Ee]nv.[Ss]et.sh && \ + dmake distclean + +clean: dmake/dmake@EXEEXT@ + @. ./*[Ee]nv.[Ss]et.sh && \ + dmake clean + +dmake/dmake@EXEEXT@: + @. ./*[Ee]nv.[Ss]et.sh && \ + ./bootstrap diff --git a/set_soenv.in b/set_soenv.in index ee227a397..c7d272945 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -2160,7 +2160,8 @@ print "*********************************************************". "******************* $newline"; print "To build, issue:\nmake\n\n"; -print "For the developer installation, issue:\nmake dev-install\n\n"; +print "To install when the build is finished, issue:\nmake install\n\n"; +print "If you want to develop LibreOffice, you might prefer:\nmake dev-install\n\n"; $bootfile = "bootstrap"; open( OUT, ">$bootfile" ) || |