Merge pull request #60 from rickystewart/src_path

Tweak import paths of .proto files in errorspb

Author: knz

Makefile.update-protos

@@ -33,11 +33,11 @@ all: $(PROTOS)
 	protoc \
 	   -I$$GOPATH/src/ \
 	   -I$$GOPATH/src/github.com \
+	   -I$$GOPATH/src/github.com/cockroachdb/errors \
 	   -I$$GOPATH/src/github.com/gogo/protobuf \
 	   -I$$GOPATH/src/github.com/gogo/protobuf/protobuf \
 	  --gogoroach_out=Mgoogle/protobuf/any.proto=github.com/gogo/protobuf/types,plugins=grpc,import_prefix=:. \
-	  $(PROTOS:%=$(GOPATH)/src/github.com/cockroachdb/errors/%)
-	mv -f github.com/cockroachdb/errors/errorspb/*.pb.go errorspb/
+	  $(PROTOS)
 	$(SED) $(SED_INPLACE) -E \
 		-e '/import _ /d' \
 		-e 's!import (fmt|math) "github.com/(fmt|math)"! !g' \

errorspb/errors.pb.go

@@ -2,7 +2,7 @@ syntax = "proto3";
 package cockroach.errorspb;
 option go_package = "errorspb";
 
-import "github.com/cockroachdb/errors/errorspb/errors.proto";
+import "errorspb/errors.proto";
 import "gogoproto/gogo.proto";
 
 // MarkPayload is the error payload for a forced marker.