Correctly handle V= only from command line, not from environment.

/trunk/ct-ng.in |   17     8     9     0 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)
This commit is contained in:
Yann E. MORIN" 2008-10-21 16:56:32 +00:00
parent c570927ef3
commit 5e5a5ef90b

View File

@ -30,10 +30,9 @@ export CT_VERSION:=@@CT_VERSION@@
export CT_STOP:=$(STOP)
export CT_RESTART:=$(RESTART)
ifeq ($(strip $(V)),)
SILENT=@
ECHO=echo
else
SILENT=@
ECHO=echo
ifeq ($(strip $(origin V)),command line)
ifeq ($(strip $(V)),0)
SILENT=@
ECHO=:
@ -45,11 +44,11 @@ else
ifeq ($(strip $(V)),2)
SILENT=
ECHO=echo
endif
endif
endif
endif
export V
endif # V == 2
endif # V== 1
endif # V == 0
endif # origin V
export SILENT ECHO
.FORCE:
.PHONY: $(PHONY)