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

Kohei Yoshida kohei.yoshida at gmail.com
Tue Mar 26 14:03:58 PDT 2013


 solenv/gbuild/partial_build.mk |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 13034c8e4487919bea2eb8c1ba12b56b1a8a356d
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Tue Mar 26 17:05:41 2013 -0400

    Revert "make partial_build work in separate builddir"
    
    This reverts commit 207e370a167b7856346c1bff0c735cd2688e2e6e.
    
    This breaks the module build i.e. cd <module> && make.

diff --git a/solenv/gbuild/partial_build.mk b/solenv/gbuild/partial_build.mk
index 8107bb2..9c7f3fb 100644
--- a/solenv/gbuild/partial_build.mk
+++ b/solenv/gbuild/partial_build.mk
@@ -1,13 +1,8 @@
 ifeq ($(gb_Side),)
 gb_Side:=host
 endif
-
-ifeq (,$(BUILDDIR))
-BUILDDIR := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))../..
-endif
-
 ifeq ($(SOLARENV),)
-include $(BUILDDIR)/config_$(gb_Side).mk
+include $(dir $(realpath $(lastword $(MAKEFILE_LIST))))../../config_$(gb_Side).mk
 endif
 
 gb_PARTIAL_BUILD := T


More information about the Libreoffice-commits mailing list