[Libreoffice-commits] core.git: solenv/gbuild
Stephan Bergmann
sbergman at redhat.com
Tue Mar 26 14:56:07 PDT 2013
solenv/gbuild/partial_build.mk | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit a13c905f8d9f2e062a1bb3d3882347b47c3359ce
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Mar 26 22:43:43 2013 +0100
Revert "Revert "make partial_build work in separate builddir""
This reverts commit 13034c8e4487919bea2eb8c1ba12b56b1a8a356d. The original
presumably works fine for a separate builddir(?), but it erroneously(?) replaced
"lastword MAKEFILE_LIST" with "firstword MAKEFILE_LIST" so "cd <module> &&
make" failed to find config_host.mk; fixed that part now.
Change-Id: Icde8315425dd230544125901de4f3a605b239155
diff --git a/solenv/gbuild/partial_build.mk b/solenv/gbuild/partial_build.mk
index 9c7f3fb..6ed700e 100644
--- a/solenv/gbuild/partial_build.mk
+++ b/solenv/gbuild/partial_build.mk
@@ -1,8 +1,13 @@
ifeq ($(gb_Side),)
gb_Side:=host
endif
+
+ifeq (,$(BUILDDIR))
+BUILDDIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))../..
+endif
+
ifeq ($(SOLARENV),)
-include $(dir $(realpath $(lastword $(MAKEFILE_LIST))))../../config_$(gb_Side).mk
+include $(BUILDDIR)/config_$(gb_Side).mk
endif
gb_PARTIAL_BUILD := T
More information about the Libreoffice-commits
mailing list