From 5e5a5ef90bba93a502262864e5e2eb834df6a1d6 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Tue, 21 Oct 2008 16:56:32 +0000 Subject: 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 --git a/ct-ng.in b/ct-ng.in index 3ac36b3..87c9728 100644 --- a/ct-ng.in +++ b/ct-ng.in @@ -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) -- cgit v0.10.2-6-g49f6