aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Nicolas Noble <nicolasnoble@users.noreply.github.com>2015-02-24 13:14:24 -0800
committerGravatar Nicolas Noble <nicolasnoble@users.noreply.github.com>2015-02-24 13:14:24 -0800
commit47f523b508b255db0a0b34f1c76efaf8714bd7b6 (patch)
treea59502e7a22d0cd0d1e66631dcdd6314bc92ca36
parent8e7a7dbdf3eb6d1e7aee96a540b774cb2885dd91 (diff)
parent044fe221b1205799c0eeff8a20b4832f4f6bff76 (diff)
Merge pull request #754 from yang-g/master
suppress output of 'which protoc'
-rw-r--r--Makefile2
-rw-r--r--templates/Makefile.template2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index ddae1ce97b..f6821ec000 100644
--- a/Makefile
+++ b/Makefile
@@ -257,7 +257,7 @@ HAS_SYSTEM_ZLIB = false
HAS_SYSTEM_PROTOBUF = false
endif
-HAS_PROTOC = $(shell $(PROTOC_CMD) && echo true || echo false)
+HAS_PROTOC = $(shell $(PROTOC_CMD) > /dev/null && echo true || echo false)
ifeq ($(HAS_PROTOC),true)
HAS_VALID_PROTOC = $(shell $(PROTOC_CHECK_CMD) 2> /dev/null && echo true || echo false)
else
diff --git a/templates/Makefile.template b/templates/Makefile.template
index 4a496cf88c..8240996cfc 100644
--- a/templates/Makefile.template
+++ b/templates/Makefile.template
@@ -274,7 +274,7 @@ HAS_SYSTEM_ZLIB = false
HAS_SYSTEM_PROTOBUF = false
endif
-HAS_PROTOC = $(shell $(PROTOC_CMD) && echo true || echo false)
+HAS_PROTOC = $(shell $(PROTOC_CMD) > /dev/null && echo true || echo false)
ifeq ($(HAS_PROTOC),true)
HAS_VALID_PROTOC = $(shell $(PROTOC_CHECK_CMD) 2> /dev/null && echo true || echo false)
else