avoid using a reserved word as a variable name

[openwrt.git] / include / verbose.mk

diff --git a/include/verbose.mk b/include/verbose.mk
index 6d7c7ef..525fbf1 100644 (file)
--- a/include/verbose.mk
+++ b/include/verbose.mk
@@ -1,11 +1,21 @@
-# OpenWrt.org 2006
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#

 # $Id:$
 
 # $Id:$
 

+ifeq ($(NO_TRACE_MAKE),)
+NO_TRACE_MAKE := $(MAKE) V=99
+export NO_TRACE_MAKE
+endif
+

 ifndef KBUILD_VERBOSE
 ifndef KBUILD_VERBOSE

-  KBUILD_VERBOSE=0
-  ifeq ("$(origin V)", "command line")
-    KBUILD_VERBOSE=$(V)
-  endif
+  KBUILD_VERBOSE:=0
+endif
+ifeq ("$(origin V)", "command line")
+  KBUILD_VERBOSE:=$(V)

 endif
 
 ifneq ($(KBUILD_VERBOSE),99)
 endif
 
 ifneq ($(KBUILD_VERBOSE),99)


@@ -18,11 +28,10 @@ ifneq ($(KBUILD_VERBOSE),99)
        }
   else
     export QUIET:=1
        }
   else
     export QUIET:=1

-    NO_TRACE_MAKE:=$(MAKE) V=99

     ifeq ($(KBUILD_VERBOSE),0)
       MAKE:=&>/dev/null $(MAKE)
     endif
     ifeq ($(KBUILD_VERBOSE),0)
       MAKE:=&>/dev/null $(MAKE)
     endif

-    MAKE:=3>&1 4>&2 $(MAKE)
+    MAKE:=cmd() { $(MAKE) $$* || {  echo "Build failed. Please re-run make with V=99 to see what's going on"; /bin/false; } } 3>&1 4>&2; cmd

   endif
 
   .SILENT: $(MAKECMDGOALS)
   endif
 
   .SILENT: $(MAKECMDGOALS)