diff options
| author | Francois Tigeot <ftigeot@wolfpond.org> | 2011-06-05 09:02:36 +0200 |
|---|---|---|
| committer | Francois Tigeot <ftigeot@wolfpond.org> | 2011-06-05 09:04:07 +0200 |
| commit | 66b2e5a82fc1ad0f6594575a9ff9a388e3e0364e (patch) | |
| tree | daa9961f32dd1af908263c8120f501e05d3232d1 /Makefile.in | |
| parent | 5dffecb3d3ef0bd7247d942adc8e24bf58e1a527 (diff) | |
Revert changes introduced with the merge of OOo dev300_m106
They break installation
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in index fff3ad1e9d21..0925b448fe77 100644 --- a/Makefile.in +++ b/Makefile.in @@ -8,10 +8,6 @@ else GBUILD_OPT:=--gmake endif -prefix = @prefix@ -exec_prefix = @exec_prefix@ -libdir = @libdir@ - ifeq (@CROSS_COMPILING@,YES) all: Makefile dmake/dmake@EXEEXT_FOR_BUILD@ src.downloaded cross-build-toolset else @@ -34,11 +30,11 @@ endif install: @. ./*Env.Set.sh && \ - echo "Installing in $${libdir:-@libdir@}/@INSTALL_DIRNAME@..." && \ - ooinstall "$${libdir:-@libdir@}/@INSTALL_DIRNAME@" && \ + echo "Installing in $${prefix:-@prefix@}..." && \ + ooinstall "$${prefix:-@prefix@}" && \ echo "" && \ echo "Installation finished, you can now execute:" && \ - echo "$${libdir:-@libdir@}/@INSTALL_DIRNAME@/program/soffice" + echo "$${prefix:-@prefix@}/program/soffice" dev-install: @. ./*Env.Set.sh && \ @@ -51,7 +47,7 @@ dev-install: @if test `uname -s` = Darwin; then \ echo open install/LibreOffice.app; \ else \ - echo "cd @abs_builddir@/install/program" && \ + echo "cd @abs_builddir@/install/program" && \ echo ". ooenv" && \ echo "./soffice.bin"; \ fi |