diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:39:04 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:39:04 +0200 |
| commit | ca907e02205e8e99e28608ddfe7bdaca24f23aa4 (patch) | |
| tree | afdf8fb6a8aef6920ad0f658bdad85c419e0c43e /Makefile.in | |
| parent | 817da75b0809642d68b3cab35a1a9348139e9321 (diff) | |
| parent | 35c884841001c6367d428db8e4407afc4d5077ca (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
Makefile.in
Repository.mk
autogen.sh
bin/lo-commit-stat
configure.in
distro-configs/LibreOfficeOpenBSD.conf
distro-configs/LibreOfficeWin32.conf
instsetoo_native/util/openoffice.lst
ooo.lst.in
scp2/source/ooo/module_langpack.ulf
set_soenv.in
solenv/bin/ooinstall
solenv/gbuild/CppunitTest.mk
solenv/gbuild/Library.mk
solenv/gbuild/LinkTarget.mk
solenv/gbuild/TargetLocations.mk
solenv/gbuild/platform/macosx.mk
solenv/gbuild/platform/solaris.mk
solenv/gbuild/platform/unxgcc.mk
solenv/gbuild/platform/windows.mk
solenv/inc/minor.mk
solenv/inc/settings.mk
tail_build/prj/makefile.mk
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index 7c9477f58cb8..c1d911d32cc9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -8,19 +8,22 @@ else GBUILD_OPT:=--gmake endif -all: Makefile dmake/dmake@EXEEXT_FOR_BUILD@ src.downloaded +prefix = @prefix@ +exec_prefix = @exec_prefix@ +libdir = @libdir@ +all: Makefile dmake/dmake@EXEEXT_FOR_BUILD@ src.downloaded @. ./*Env.Set.sh && \ cd instsetoo_native && \ build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ install: @. ./*Env.Set.sh && \ - echo "Installing in $${prefix:-@prefix@}..." && \ - ooinstall "$${prefix:-@prefix@}" && \ + echo "Installing in $${libdir:-@libdir@}/@INSTALL_DIRNAME@..." && \ + ooinstall "$${libdir:-@libdir@}/@INSTALL_DIRNAME@" && \ echo "" && \ echo "Installation finished, you can now execute:" && \ - echo "$${prefix:-@prefix@}/program/soffice" + echo "$${libdir:-@libdir@}/@INSTALL_DIRNAME@/program/soffice" dev-install: @. ./*Env.Set.sh && \ |