fix lxdialog cc/ldflags check script for darwin/osx

[openwrt/staging/dedeckeh.git] / openwrt / Makefile

diff --git a/openwrt/Makefile b/openwrt/Makefile
index 90bc5deb0963d6ee90acf4034408bc71df1b9eac..88d4ae517c5e4a7faaaf5440c787fca56712248b 100644 (file)
--- a/openwrt/Makefile
+++ b/openwrt/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 package/$${dir}Makefile" >&2; \
+               $(NO_TRACE_MAKE) --no-print-dir DUMP=1 -C $$dir || echo "ERROR: please fix $${dir}Makefile" >&2; \
        done > $@
 
 pkginfo-clean: FORCE
@@ -53,7 +53,7 @@ pkginfo-clean: FORCE
 .config.in: .pkginfo
        @./scripts/gen_menuconfig.pl < $< > $@ || rm -f $@
 
-.config: ./scripts/config/conf
+.config: ./scripts/config/conf .config.in
        @[ -f .config ] || $(NO_TRACE_MAKE) menuconfig
        @$< -D .config Config.in &> /dev/null
 
@@ -91,8 +91,10 @@ 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
@@ -100,6 +102,7 @@ toolchain/%: FORCE
                echo "Prerequisite check failed. Use FORCE=1 to override."; \
                false; \
        }
+       @rm -rf "$(TOPDIR)/tmp"
        @touch $@
        
 prereq: .prereq-build .prereq-packages FORCE