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

[Peter Foley]

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

New commits:
commit 7f3c006d9b7fb8d57d69e3385703516f0932b168
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Tue Feb 26 15:45:21 2013 -0500

    fixes for building in a separate dir
    
    Change-Id: I244fa0c54c8d98827ab0a987ba353dedf733e695

diff --git a/Makefile.in b/Makefile.in
index 35a24d8..00ae07e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -65,7 +65,7 @@ endif
 $(WORKDIR)/modules.mk: $(wildcard */Module_*.mk) $(wildcard */prj/dmake) $(BUILDDIR)/config_host.mk
 	mkdir -p $(dir $@)
 	echo "gbuild_modules:= tail_build \\" > $@
-	for m in */Module_*.mk; do echo $$m | sed -e 's/\/.*$$/ \\/'; done >> $@
+	for m in `cd $(SRCDIR) && */Module_*.mk`; do echo $$m | sed -e 's/\/.*$$/ \\/'; done >> $@
 	echo >> $@
 	echo -n "dmake_modules:=" >> $@
 	echo >> $@
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 686b09f..7c9d5ec 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -282,7 +282,7 @@ include $(GBUILDDIR)/Deliver.mk
 
 $(eval $(call gb_Deliver_init))
 
-include $(SOLARENV)/inc/minor.mk
+include $(BUILDDIR)/solenv/inc/minor.mk
 
 # We are using a set of scopes that we might as well call classes.