X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/eee6df98720ffd573fefc079963beffe6b2b034c..2e73ce15002b9a339f44f48fc9d329a62b56ae4d:/Makefile?ds=sidebyside

diff --git a/Makefile b/Makefile
index 32cadb7f9..6df34ac77 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@ endif
 	@echo Collecting package info...
 	@-for dir in package/*/; do \
 		echo Source-Makefile: $${dir}Makefile; \
-		$(NO_TRACE_MAKE) --no-print-dir DUMP=1 -C $$dir 2>&- || echo "ERROR: please fix $${dir}Makefile" >&2; \
+		$(NO_TRACE_MAKE) --no-print-dir DUMP=1 -C $$dir || echo "ERROR: please fix $${dir}Makefile" >&2; \
 	done > $@
 
 pkginfo-clean: FORCE
@@ -53,7 +53,7 @@ pkginfo-clean: FORCE
 .config.in: .pkginfo
 	@./scripts/gen_menuconfig.pl < $< > $@ || rm -f $@
 
-.config: ./scripts/config/conf
+.config: ./scripts/config/conf .config.in
 	@[ -f .config ] || $(NO_TRACE_MAKE) menuconfig
 	@$< -D .config Config.in &> /dev/null
 
@@ -96,10 +96,11 @@ toolchain/%: FORCE
 	@touch $@
 
 .prereq-packages: include/prereq.mk .pkginfo .config
-	@$(NO_TRACE_MAKE) -s -C package prereq 2>/dev/null || { \
+	@$(NO_TRACE_MAKE) -s -C package TMPDIR="$(TOPDIR)/tmp" prereq 2>/dev/null || { \
 		echo "Prerequisite check failed. Use FORCE=1 to override."; \
 		false; \
 	}
+	@rm -rf "$(TOPDIR)/tmp"
 	@touch $@
 	
 prereq: .prereq-build .prereq-packages FORCE