[Libreoffice-commits] .: solenv/gbuild

[Norbert Thiebaud]

 solenv/gbuild/extensions/post_BuildplTargets.mk |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 81e9525305cfe2b9455dadceeda0710e0176448c
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Feb 5 21:00:54 2012 -0600

    still invalid use of WORKDIR in top level Makefile

diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 1ba2ffb..8bd3151 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -110,7 +110,7 @@ endef
 
 # the build order dependencies are rather ugly...
 dev-install: \
-			$(WORKDIR)/bootstrap \
+			$(SRCDIR)/workdir/$(INPATH)/bootstrap \
 			$(SRCDIR)/src.downloaded \
 			$(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) \
 		|   $(filter build,$(MAKECMDGOALS)) \
@@ -177,11 +177,11 @@ endif # gb_SourceEnvAndRecurse_STAGE=buildpl
 
 ifeq ($(gb_SourceEnvAndRecurse_STAGE),gbuild)
 
-dev-install: $(WORKDIR)/bootstrap  $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | $(filter build,$(MAKECMDGOALS))
+dev-install: $(SRCDIR)/workdir/$(INPATH)/bootstrap  $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | $(filter build,$(MAKECMDGOALS))
 
-build: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset)
+build: $(SRCDIR)/workdir/$(INPATH)bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset)
 
-cross_toolset: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded
+cross_toolset: $(SRCDIR)/workdir/$(INPATH)/bootstrap $(SRCDIR)/src.downloaded
 
 findunusedcode: