aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2022-04-08 23:16:59 -0700
committerEric Biggers <ebiggers@google.com>2022-04-08 23:38:01 -0700
commitca7a84b8aea203025acbda193f78ea98946236b5 (patch)
tree2b9e781db960662c570b5b35f840369130fc87a7 /Makefile
parenta224e769a478cc446c05dbfd5eb7e32d31933172 (diff)
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.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
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: