sync pptp ifup script with whiterussian

[openwrt.git] / openwrt / rules.mk

diff --git a/openwrt/rules.mk b/openwrt/rules.mk
index e6118bf..1651a44 100644 (file)
--- a/openwrt/rules.mk
+++ b/openwrt/rules.mk
@@ -6,26 +6,36 @@ ifeq ($(V),)
 V=99
 endif
 
 V=99
 endif
 

+

 ifneq ($(V),0)
 TRACE:=echo "---> "
 ifneq ($(V),0)
 TRACE:=echo "---> "

+START_TRACE:=echo -n "---> "
+END_TRACE:=echo

 else
 else

+START_TRACE:=:
+END_TRACE:=:

 TRACE:=:
 endif
 
 ifeq (${shell [ "$(V)" -ge 5 ] && echo 1},)
 TRACE:=:
 endif
 
 ifeq (${shell [ "$(V)" -ge 5 ] && echo 1},)

+CMD_TRACE:=:

 PKG_TRACE:=:
 else
 PKG_TRACE:=:
 else

+CMD_TRACE:=echo -n

 PKG_TRACE:=echo "------> "
 endif
 
 ifeq (${shell [ "$(V)" -ge 10 ] && echo 1},)
 EXTRA_MAKEFLAGS:=-s
 PKG_TRACE:=echo "------> "
 endif
 
 ifeq (${shell [ "$(V)" -ge 10 ] && echo 1},)
 EXTRA_MAKEFLAGS:=-s

-MAKE_TRACE:=>&/dev/null
+MAKE_TRACE:=2>&1 >&/dev/null || { echo "Build failed. Please re-run make with V=99 to see what's going on"; /bin/false; }

 else
 MAKE_TRACE:=
 EXTRA_MAKEFLAGS:=
 TRACE:=:
 PKG_TRACE:=:
 else
 MAKE_TRACE:=
 EXTRA_MAKEFLAGS:=
 TRACE:=:
 PKG_TRACE:=:

+CMD_TRACE:=:
+START_TRACE:=:
+END_TRACE:=:

 endif
 
 MAKE1=make
 endif
 
 MAKE1=make