clean up and really fix bogus build_ directory

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4854 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/Makefile b/Makefile
index 6df34ac771e3432416c0031df78d414dbdf88f09..88d4ae517c5e4a7faaaf5440c787fca56712248b 100644 (file)
--- a/Makefile
+++ b/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/include/prereq-build.mk b/include/prereq-build.mk
index 11403c2fdcaf5ee68bffec541cc0245685f020db..a2e5469fa633b62f074f2863797a0056738305ba 100644 (file)
--- a/include/prereq-build.mk
+++ b/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