Merge 89eaec7a9e into 736d9f8c43

9 years ago · 1bd58ca823
parent 736d9f8c43 89eaec7a9e
commit 1bd58ca823
1 changed files with 4 additions and 3 deletions
--- a/7
+++ b/7
@ -112,11 +112,12 @@ endif
 ifndef HAS_GOX
 	go get -u github.com/mitchellh/gox
 endif
+
 ifndef HAS_HG
-	$(error You must install Mercurial (hg))
-endif
+	@echo "Mercurial is not installed! Checking for Git"
 ifndef HAS_GIT
-	$(error You must install Git)
+	$(error You must either install Mercurial  or Git)
+endif
 endif
 	glide install --strip-vendor
 	go build -o bin/protoc-gen-go ./vendor/github.com/golang/protobuf/protoc-gen-go