diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-03-08 11:52:10 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-03-08 23:06:02 +0200 |
| commit | 03c6bfff92b10fc9f8ab82dcea1303dfe763f94c (patch) | |
| tree | 1db85dc15685c873198e8df952db0a6b3c0eb710 /Makefile | |
| parent | 67381d234f4ce73db5b4f5cdaadb06c2b602788e (diff) | |
The instsetoo_native part is unnecessary when doing dev-install
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -389,7 +389,7 @@ bootstrap: $(WORKDIR_BOOTSTRAP) # # Build # -build: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset) +build-packimages: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset) ifeq ($(DISABLE_SCRIPTING),TRUE) # We must get the headers from vbahelper "delivered" because # as we don't link to any libs from there they won't otherwise be, or @@ -404,6 +404,8 @@ ifeq ($(DISABLE_DBCONNECTIVITY),TRUE) endif cd packimages && unset MAKEFLAGS && \ $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) + +build: build-packimages ifeq ($(OS_FOR_BUILD),WNT) cd instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl else @@ -426,7 +428,7 @@ install: echo "Installation finished, you can now execute:" && \ echo "$(INSTALLDIR)/program/soffice" -dev-install: build +dev-install: build-packimages @rm -rf $(OUTDIR)/installation @mkdir $(OUTDIR)/installation ifeq ($(DISABLE_LINKOO),TRUE) |