From ca7a84b8aea203025acbda193f78ea98946236b5 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Fri, 8 Apr 2022 23:16:59 -0700 Subject: Switch to google.golang.org/protobuf/proto github.com/golang/protobuf/proto has been deprecated in favor of google.golang.org/protobuf/proto, so migrate to the non-deprecated one. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b265b02..9e25d42 100644 --- a/Makefile +++ b/Makefile @@ -98,7 +98,7 @@ $(PAM_MODULE): $(GO_FILES) $(C_FILES) rm -f $(BIN)/$(PAM_NAME).h gen: $(BIN)/protoc $(BIN)/protoc-gen-go $(PROTO_FILES) - protoc --go_out=. $(PROTO_FILES) + protoc --go_out=. --go_opt=paths=source_relative $(PROTO_FILES) format: $(BIN)/goimports goimports -w $(GO_NONGEN_FILES) @@ -203,7 +203,7 @@ tools: $(TOOLS) $(BIN)/golint: go build -o $@ golang.org/x/lint/golint $(BIN)/protoc-gen-go: - go build -o $@ github.com/golang/protobuf/protoc-gen-go + go build -o $@ google.golang.org/protobuf/cmd/protoc-gen-go $(BIN)/goimports: go build -o $@ golang.org/x/tools/cmd/goimports $(BIN)/staticcheck: -- cgit v1.2.3