From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 24 Sep 2006 13:46:10 +0000 (+0000)
Subject: clean up and really fix bogus build_ directory
X-Git-Tag: kamikaze_7.06~1495^2~115
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=732b4932f1f3460e1c1026586981e06f698edba9;p=openwrt%2Fsvn-archive%2Fopenwrt.git

clean up and really fix bogus build_ directory

SVN-Revision: 4854
---

diff --git a/openwrt/Makefile b/openwrt/Makefile
index 6df34ac771..88d4ae517c 100644
--- a/openwrt/Makefile
+++ b/openwrt/Makefile
@@ -91,12 +91,14 @@ toolchain/%: FORCE
 .prereq-build: include/prereq-build.mk
 	@$(NO_TRACE_MAKE) -s -f $(TOPDIR)/include/prereq-build.mk prereq 2>/dev/null || { \
 		echo "Prerequisite check failed. Use FORCE=1 to override."; \
+		rm -rf $(TOPDIR)/tmp; \
 		false; \
 	}
+	@rm -rf $(TOPDIR)/tmp
 	@touch $@
 
 .prereq-packages: include/prereq.mk .pkginfo .config
-	@$(NO_TRACE_MAKE) -s -C package TMPDIR="$(TOPDIR)/tmp" prereq 2>/dev/null || { \
+	@$(NO_TRACE_MAKE) -s -C package prereq 2>/dev/null || { \
 		echo "Prerequisite check failed. Use FORCE=1 to override."; \
 		false; \
 	}
diff --git a/openwrt/include/prereq-build.mk b/openwrt/include/prereq-build.mk
index 11403c2fdc..a2e5469fa6 100644
--- a/openwrt/include/prereq-build.mk
+++ b/openwrt/include/prereq-build.mk
@@ -6,6 +6,7 @@
 #
 
 include $(TOPDIR)/rules.mk
+TMP_DIR:=$(TOPDIR)/tmp
 include $(INCLUDE_DIR)/prereq.mk
 
 define Require/non-root