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_STOP:=$(STOP)
export CT_RESTART:=$(RESTART) export CT_RESTART:=$(RESTART)
ifeq ($(strip $(V)),) SILENT=@
SILENT=@ ECHO=echo
ECHO=echo ifeq ($(strip $(origin V)),command line)
else
ifeq ($(strip $(V)),0) ifeq ($(strip $(V)),0)
SILENT=@ SILENT=@
ECHO=: ECHO=:
@ -45,11 +44,11 @@ else
ifeq ($(strip $(V)),2) ifeq ($(strip $(V)),2)
SILENT= SILENT=
ECHO=echo ECHO=echo
endif endif # V == 2
endif endif # V== 1
endif endif # V == 0
endif endif # origin V
export V export SILENT ECHO
.FORCE: .FORCE:
.PHONY: $(PHONY) .PHONY: $(PHONY)