diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-07-28 18:33:58 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-07-28 18:33:58 +0200 |
| commit | a95376174ec70c4a75569ce6dafacb0f696b21bc (patch) | |
| tree | c1b813dddd1c32efb22913cc3b2f5813e6d901ff /Makefile.in | |
| parent | edb451c490fe72ced8df20829c7fbc0da93e672c (diff) | |
| parent | 6760b5695c4461126a34a84f64fd7114eff23143 (diff) | |
Merge commit 'libreoffice-3.4.2.3'
Conflicts:
Makefile.in
configure.in
instsetoo_native/util/makefile.mk
instsetoo_native/util/openoffice.lst
ooo.lst.in
set_soenv.in
solenv/inc/minor.mk
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 0f4d99a03c51..ac01221c5a12 100644 --- a/Makefile.in +++ b/Makefile.in @@ -93,11 +93,18 @@ endif install: @. ./Env.Host.sh && \ - echo "Installing in $${prefix:-@prefix@}..." && \ - ooinstall "$${prefix:-@prefix@}" && \ + @. ./*[Ee]nv.[Ss]et.sh && \ + echo "Installing in @INSTALLDIR@..." && \ + ooinstall "@INSTALLDIR@" && \ echo "" && \ echo "Installation finished, you can now execute:" && \ - echo "$${prefix:-@prefix@}/program/soffice" + echo "@INSTALLDIR@/program/soffice" + +distro-pack-install: install + ./bin/distro-install-clean-up + ./bin/distro-install-desktop-integration + ./bin/distro-install-sdk + ./bin/distro-install-file-lists dev-install: @. ./Env.Host.sh && \ |