Skip to content

Commit

Permalink
Merge pull request #117 from tw3n/master
Browse files Browse the repository at this point in the history
makefile: consistent use of go option (thanks to @tw3n )
  • Loading branch information
iwilltry42 authored Oct 6, 2019
2 parents 9aa5af8 + 81748f9 commit 0d01441
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ clean:
@rm -rf $(BINDIR) _dist/

extra-clean: clean
go clean -i $(PKG_GOX)
go clean -i $(PKG_GOLANGCI_LINT)
$(GO) clean -i $(PKG_GOX)
$(GO) clean -i $(PKG_GOLANGCI_LINT)

# fmt will fix the golang source style in place.
fmt:
Expand All @@ -90,7 +90,7 @@ HAS_GOLANGCI := $(shell command -v golangci-lint 2> /dev/null)

install-tools:
ifndef HAS_GOX
(go get $(PKG_GOX))
($(GO) get $(PKG_GOX))
endif
ifndef HAS_GOLANGCI
(curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b ${GOPATH}/bin v1.17.1)
Expand Down

0 comments on commit 0d01441

Please sign in to comment.