hide rm -rf command in Makefile

[openwrt.git] / Makefile

diff --git a/Makefile b/Makefile
index 90bc5de..fe10e07 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@ endif
        @echo Collecting package info...
        @-for dir in package/*/; do \
                echo Source-Makefile: $${dir}Makefile; \
        @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
        done > $@
 
 pkginfo-clean: FORCE


@@ -96,10 +96,11 @@ toolchain/%: FORCE
        @touch $@
 
 .prereq-packages: include/prereq.mk .pkginfo .config
        @touch $@
 
 .prereq-packages: include/prereq.mk .pkginfo .config

-       @$(NO_TRACE_MAKE) -s -C package prereq 2>/dev/null || { \
+       @$(NO_TRACE_MAKE) -s -C package TMPDIR="$(TOPDIR)/tmp" prereq 2>/dev/null || { \

                echo "Prerequisite check failed. Use FORCE=1 to override."; \
                false; \
        }
                echo "Prerequisite check failed. Use FORCE=1 to override."; \
                false; \
        }

+       @rm -rf "$(TOPDIR)/tmp"

        @touch $@
        
 prereq: .prereq-build .prereq-packages FORCE
        @touch $@
        
 prereq: .prereq-build .prereq-packages FORCE