[Libreoffice-commits] .: Makefile.in
François Tigeot
ftigeot at kemper.freedesktop.org
Sun Jun 5 00:04:36 PDT 2011
Makefile.in | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
New commits:
commit e7f5a5a240a787299a2d3957522ac2d7f9e576b1
Author: Francois Tigeot <ftigeot at wolfpond.org>
Date: Sun Jun 5 09:02:36 2011 +0200
Revert changes introduced with the merge of OOo dev300_m106
They break installation
diff --git a/Makefile.in b/Makefile.in
index fff3ad1..0925b44 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 at EXEEXT_FOR_BUILD@ src.downloaded cross-build-toolset
else
@@ -34,11 +30,11 @@ endif
install:
@. ./*Env.Set.sh && \
- echo "Installing in $${libdir:- at libdir@}/@INSTALL_DIRNAME at ..." && \
- ooinstall "$${libdir:- at libdir@}/@INSTALL_DIRNAME@" && \
+ echo "Installing in $${prefix:- at prefix@}..." && \
+ ooinstall "$${prefix:- at prefix@}" && \
echo "" && \
echo "Installation finished, you can now execute:" && \
- echo "$${libdir:- at libdir@}/@INSTALL_DIRNAME@/program/soffice"
+ echo "$${prefix:- at 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
More information about the Libreoffice-commits
mailing list