From 1d072248383ae47bd68032d69bd86cc060796ef4 Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 24 Sep 2006 13:46:10 +0000 Subject: [PATCH] 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 --- Makefile | 4 +++- include/prereq-build.mk | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6df34ac77..88d4ae517 100644 --- 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 11403c2fd..a2e5469fa 100644 --- 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 -- 2.35.1