clean up and really fix bogus build_ directory
authorFelix Fietkau <nbd@openwrt.org>
Sun, 24 Sep 2006 13:46:10 +0000 (13:46 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Sun, 24 Sep 2006 13:46:10 +0000 (13:46 +0000)
SVN-Revision: 4854

openwrt/Makefile
openwrt/include/prereq-build.mk

index 6df34ac..88d4ae5 100644 (file)
@@ -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; \
        }
index 11403c2..a2e5469 100644 (file)
@@ -6,6 +6,7 @@
 #
 
 include $(TOPDIR)/rules.mk
+TMP_DIR:=$(TOPDIR)/tmp
 include $(INCLUDE_DIR)/prereq.mk
 
 define Require/non-root