update zd1211 to r83, fix build on 2.6.19

[openwrt.git] / include / verbose.mk

diff --git a/include/verbose.mk b/include/verbose.mk
index 36002ae..b4242f2 100644 (file)
--- a/include/verbose.mk
+++ b/include/verbose.mk
@@ -18,7 +18,7 @@ ifeq ("$(origin V)", "command line")
   KBUILD_VERBOSE:=$(V)
 endif
 
   KBUILD_VERBOSE:=$(V)
 endif
 

-ifneq ($(shell tty -s <&3 || echo x),x)
+ifeq ($(IS_TTY),1)

   _Y:="\\33[33m"# yellow
   _N:="\\33[m"#        normal
 endif
   _Y:="\\33[33m"# yellow
   _N:="\\33[m"#        normal
 endif


@@ -36,7 +36,7 @@ ifneq ($(KBUILD_VERBOSE),99)
     ifeq ($(KBUILD_VERBOSE),0)
       MAKE:=&>/dev/null $(MAKE)
     endif
     ifeq ($(KBUILD_VERBOSE),0)
       MAKE:=&>/dev/null $(MAKE)
     endif

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

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