Skip to content

Commit faf38c1

Browse files
authored
Merge pull request #4768 from stevekuznetsov/skuznets/update-makefile
✨ Makefile: handle $GOPATH with a trailing slash
2 parents 80bd9ec + 4a6b4d3 commit faf38c1

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ DOCKER_BUILDKIT=1
7676
export ACK_GINKGO_DEPRECATIONS := 1.16.4
7777

7878
# Set --output-base for conversion-gen if we are not within GOPATH
79-
ifneq ($(abspath $(REPO_ROOT)),$(shell go env GOPATH)/src/sigs.k8s.io/cluster-api-provider-aws)
79+
ifneq ($(abspath $(REPO_ROOT)),$(abspath $(shell go env GOPATH)/src/sigs.k8s.io/cluster-api-provider-aws))
8080
GEN_OUTPUT_BASE := --output-base=$(REPO_ROOT)
8181
else
8282
export GOPATH := $(shell go env GOPATH)

0 commit comments

Comments
 (0)