summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2008-10-21 16:56:32 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2008-10-21 16:56:32 (GMT)
commit5e5a5ef90bba93a502262864e5e2eb834df6a1d6 (patch)
treef73cb7076fb050e8f7ae18427aaca1aa56fc9f0c
parentc570927ef3ca89ae0e464b3e9cb1ecbe9b60b9aa (diff)
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(-)
-rw-r--r--ct-ng.in17
1 files 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)