diff options
| author | Mike Baker <mbm@openwrt.org> | 2006-06-23 22:46:07 +0000 |
|---|---|---|
| committer | Mike Baker <mbm@openwrt.org> | 2006-06-23 22:46:07 +0000 |
| commit | b7efe798c86ff6716c1ba1cec39d3532859c5a89 (patch) | |
| tree | a0ced423b478b91fbedc55b670627000ca604e6b | |
| parent | 53349e67e39452ae4960288529377c44e3ff9c95 (diff) | |
| download | mtk-20170518-b7efe798c86ff6716c1ba1cec39d3532859c5a89.zip mtk-20170518-b7efe798c86ff6716c1ba1cec39d3532859c5a89.tar.gz mtk-20170518-b7efe798c86ff6716c1ba1cec39d3532859c5a89.tar.bz2 | |
prevent verbose script from corrupting .pkginfo
SVN-Revision: 4067
| -rw-r--r-- | openwrt/Makefile | 2 | ||||
| -rw-r--r-- | openwrt/include/verbose.mk | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/openwrt/Makefile b/openwrt/Makefile index a554a1d..10652c0 100644 --- a/openwrt/Makefile +++ b/openwrt/Makefile @@ -46,7 +46,7 @@ ifneq ($(shell ./scripts/timestamp.pl -p .pkginfo package Makefile),.pkginfo) @echo Collecting package info... @-for dir in package/*/; do \ echo Source-Makefile: $${dir}Makefile; \ - $(MAKE) --no-print-dir DUMP=1 -C $$dir 2>&- || true; \ + $(NO_TRACE_MAKE) --no-print-dir DUMP=1 -C $$dir 2>&- || true; \ done > $@ endif diff --git a/openwrt/include/verbose.mk b/openwrt/include/verbose.mk index 1ef403c..6d7c7ef 100644 --- a/openwrt/include/verbose.mk +++ b/openwrt/include/verbose.mk @@ -2,17 +2,12 @@ # $Id:$ ifndef KBUILD_VERBOSE - ifeq ($(DUMP),) - KBUILD_VERBOSE=0 - else - KBUILD_VERBOSE=99 - endif + KBUILD_VERBOSE=0 ifeq ("$(origin V)", "command line") KBUILD_VERBOSE=$(V) endif endif - ifneq ($(KBUILD_VERBOSE),99) ifeq ($(QUIET),1) $(MAKECMDGOALS): trace @@ -23,6 +18,7 @@ ifneq ($(KBUILD_VERBOSE),99) } else export QUIET:=1 + NO_TRACE_MAKE:=$(MAKE) V=99 ifeq ($(KBUILD_VERBOSE),0) MAKE:=&>/dev/null $(MAKE) endif |