diff --git a/Makefile b/Makefile index 9d5b30e9..6af854a0 100644 --- a/Makefile +++ b/Makefile @@ -24,11 +24,9 @@ node_modules/build: .build/bin/hound: $(SRCS) go build -o $@ github.com/hound-search/hound/cmds/hound -.build/bin/go-bindata: - GOPATH=`pwd`/.build go install github.com/go-bindata/go-bindata/... - -ui/bindata.go: .build/bin/go-bindata node_modules $(wildcard ui/assets/**/*) - rsync -r ui/assets/* .build/ui +ui/.build/ui: node_modules/build $(UI) + mkdir -p ui/.build/ui + cp -r ui/assets/* ui/.build/ui npx webpack $(WEBPACK_ARGS) dev: node_modules/build @@ -39,10 +37,11 @@ test: lint: export GO111MODULE=on - go install github.com/golangci/golangci-lint/cmd/golangci-lint + go get github.com/golangci/golangci-lint/cmd/golangci-lint export GOPATH=/tmp/gopath export PATH=$GOPATH/bin:$PATH golangci-lint run ./... clean: rm -rf .build ui/.build node_modules +