[Libreoffice-commits] .: Makefile.in
Sebastian Spaeth
spaetz at kemper.freedesktop.org
Wed Nov 10 23:49:56 PST 2010
Makefile.in | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
New commits:
commit 536e370044700024e917dd39387be66c03ed1606
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date: Thu Nov 11 08:42:52 2010 +0100
Makefile.in: set dev-install target during ./configuration
Rather than relying on the sourced environment variables, create
Makefile with the correct dev-install target folder during the
./configure run. Slightly prettified the file.
diff --git a/Makefile.in b/Makefile.in
index f14fbd4..eb67773 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,23 +1,25 @@
-# just dumb wrapper; make install comes later
+# @configure_input@
+# FIXME: create 'install' and 'check' target
SHELL=/bin/sh
all:
@. ./*[Ee]nv.[Ss]et.sh && \
- ./bootstrap && \
- cd instsetoo_native && ../solenv/bin/build.pl -P at BUILD_NCPUS@ --all -P at BUILD_MAX_JOBS@
+ ./bootstrap && \
+ cd instsetoo_native && \
+ ../solenv/bin/build.pl -P at BUILD_NCPUS@ --all -P at BUILD_MAX_JOBS@
distclean:
@. ./*[Ee]nv.[Ss]et.sh && \
- dmake distclean
+ dmake distclean
clean:
@. ./*[Ee]nv.[Ss]et.sh && \
- dmake clean
+ dmake clean
dev-install:
@. ./*[Ee]nv.[Ss]et.sh && \
- ooinstall -l $$SRC_ROOT/install && \
- echo && \
- echo "Developer installation finished, you can find it here:" && \
- echo "$$SRC_ROOT/install"
+ ooinstall -l @abs_builddir@/install && \
+ echo "" && \
+ echo "Developer installation finished, you can now execute:" && \
+ echo "@abs_builddir@/install/program/soffice"
More information about the Libreoffice-commits
mailing list