echopb/Makefile: fix proto search path, and update generated file

philips · Jul 6, 2017 · 872b49a · 872b49a
1 parent 0bf7df6
commit 872b49a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -7,8 +7,8 @@ To try it all out do this:
 ```
 $ git clone https://github.com/philips/grpc-gateway-example.git
 $ glide install
-$ go install ./vender/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway
-$ go install ./vender/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger
+$ go install ./vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway
+$ go install ./vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger
 $ go build
 $ grpc-gateway-example serve
 $ grpc-gateway-example echo "my first rpc echo"

diff --git a/echopb/Makefile b/echopb/Makefile
@@ -1,17 +1,17 @@
 all:
 	protoc -I/usr/local/include -I. \
 		-I${GOPATH}/src \
-		-I../github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis \
+		-I../vendor/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis \
 		--go_out=plugins=grpc:. \
 		service.proto
 	protoc -I/usr/local/include -I. \
 		-I${GOPATH}/src \
-		-I../github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis \
+		-I../vendor/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis \
 		--grpc-gateway_out=logtostderr=true:. \
 		service.proto
 	protoc -I/usr/local/include -I. \
 		-I${GOPATH}/src \
-		-I../github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis \
+		-I../vendor/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis \
 		--swagger_out=logtostderr=true:. \
 		service.proto
 	go generate .
diff --git a/echopb/service.pb.gw.go b/echopb/service.pb.gw.go