X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=Makefile;h=fe10e07dd968133979cb404ee3184692559f7d3f;hb=85b201f54538e4198183126a9f00130e2fc01df0;hp=32cadb7f991e7455a14684715c00c73a1c9b5777;hpb=eee6df98720ffd573fefc079963beffe6b2b034c;p=openwrt.git diff --git a/Makefile b/Makefile index 32cadb7f99..fe10e07dd9 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 @@ -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