summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.in2
-rw-r--r--solenv/gbuild/gbuild.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index 35a24d802f99..00ae07e3b6f4 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 686b09f853a7..7c9d5ec0e9e9 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.