[Libreoffice-commits] core.git: Makefile.in solenv/gbuild

[Matúš Kukan]

 Makefile.in                    |    6 +++---
 solenv/gbuild/partial_build.mk |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 13bb2310e3ccc500522b1bd8de50e4ecc24074db
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Thu Feb 28 11:33:12 2013 +0100

    fix make <module> for BUILDDIR <> SRCDIR
    
    Change-Id: I63528f351685167c1d67551d92afc2826a8b42ac

diff --git a/Makefile.in b/Makefile.in
index 09788ff..aee4b90 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -66,13 +66,13 @@ define gbuild_module_rules
 .PHONY: $(1) $(1).all $(1).build $(1).check $(1).clean $(1).showdeliverables $(1).subsequentcheck
 
 $(1): bootstrap fetch
-	cd $(1) && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS)
+	cd $(SRCDIR)/$(1) && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS)
 
 $(1).build $(1).check $(1).clean $(1).showdeliverables:
-	cd $(1) && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) $$(patsubst $(1).%,%,$$@)
+	cd $(SRCDIR)/$(1) && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) $$(patsubst $(1).%,%,$$@)
 
 $(1).subsequentcheck:
-	cd $(1) && $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) subsequentcheck
+	cd $(SRCDIR)/$(1) && $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) subsequentcheck
 
 $(1).all: bootstrap fetch
 	$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.build $(WORKDIR)/Module/$(1) $(WORKDIR)/Module/check/$(1) $(WORKDIR)/Module/slowcheck/$(1)
diff --git a/solenv/gbuild/partial_build.mk b/solenv/gbuild/partial_build.mk
index 4583ef6..aa7def4 100644
--- a/solenv/gbuild/partial_build.mk
+++ b/solenv/gbuild/partial_build.mk
@@ -1,7 +1,7 @@
-ifeq ($(SOLARENV),)
 ifeq ($(gb_Side),)
 gb_Side:=host
 endif
+ifeq ($(SOLARENV),)
 include $(dir $(realpath $(lastword $(MAKEFILE_LIST))))../../config_$(gb_Side).mk
 endif