# HG changeset patch # User "Yann E. MORIN" # Date 1224608192 0 # Node ID a9e7de970e5e025faef7d0705e331799eb426913 # Parent edd62c12189259b24f264df2c3f22dae2ddc7158 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(-) diff -r edd62c121892 -r a9e7de970e5e ct-ng.in --- a/ct-ng.in Tue Oct 21 16:13:46 2008 +0000 +++ b/ct-ng.in Tue Oct 21 16:56:32 2008 +0000 @@ -30,10 +30,9 @@ 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 @@ 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)