summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Spaeth <Sebastian@SSpaeth.de>2010-11-11 08:42:52 +0100
committerSebastian Spaeth <Sebastian@SSpaeth.de>2010-11-11 08:42:52 +0100
commit536e370044700024e917dd39387be66c03ed1606 (patch)
tree761117c011a0d5733d1cfd354f0c17720c6b06df
parent61e8dbbdea1df3dbc2044ed8b764038752514fb5 (diff)
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.
-rw-r--r--Makefile.in20
1 files changed, 11 insertions, 9 deletions
diff --git a/Makefile.in b/Makefile.in
index f14fbd453..eb67773a3 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@BUILD_NCPUS@ --all -P@BUILD_MAX_JOBS@
+ ./bootstrap && \
+ cd instsetoo_native && \
+ ../solenv/bin/build.pl -P@BUILD_NCPUS@ --all -P@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"