summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-11-12 01:55:28 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-11-12 01:55:28 +0000
commite2d11959004b18bef392cbc913279eb1b5503b89 (patch)
tree9c245e5990a829b3c87a13a609cec2142fd3439b
parent00ff299f672bb198eaf876e395e4bb683b26fa93 (diff)
another optimization
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5507 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--Makefile7
-rw-r--r--include/verbose.mk2
2 files changed, 7 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index d6b1b7d61..62a033874 100644
--- a/Makefile
+++ b/Makefile
@@ -21,10 +21,15 @@ SHELL:=/usr/bin/env bash
export LC_ALL=C
export LANG=C
export TOPDIR=${shell pwd}
-include $(TOPDIR)/include/verbose.mk
ifeq ($(KBUILD_VERBOSE),99)
MAKE:=3>/dev/null $(MAKE)
endif
+ifneq ($(shell tty -s <&3 || echo x),x)
+ IS_TTY=1
+ export IS_TTY
+endif
+
+include $(TOPDIR)/include/verbose.mk
OPENWRTVERSION:=$(RELEASE)
ifneq ($(VERSION),)
diff --git a/include/verbose.mk b/include/verbose.mk
index 34568a31f..b4242f212 100644
--- a/include/verbose.mk
+++ b/include/verbose.mk
@@ -18,7 +18,7 @@ ifeq ("$(origin V)", "command line")
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