From 94f411eda1a3c9a9b20218f2899c82dca453034b Mon Sep 17 00:00:00 2001 From: Sebastien Douheret Date: Fri, 23 Jun 2017 18:12:29 +0200 Subject: [PATCH] Fix glide path for non Linux OSes --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 1d1e07d..ad017eb 100644 --- a/Makefile +++ b/Makefile @@ -93,13 +93,13 @@ package-all: GOOS=darwin GOARCH=amd64 RELEASE=1 make -f $(ROOT_SRCDIR)/Makefile package test: tools/glide - go test --race $(shell ./tools/linux/glide novendor) + go test --race $(shell $(LOCAL_TOOLSDIR)/glide novendor) vet: tools/glide - go vet $(shell ./tools/linux/glide novendor) + go vet $(shell $(LOCAL_TOOLSDIR)/glide novendor) fmt: tools/glide - go fmt $(shell ./tools/linux/glide novendor) + go fmt $(shell $(LOCAL_TOOLSDIR)/glide novendor) run: build/xds tools/syncthing/copytobin $(LOCAL_BINDIR)/xds-agent$(EXT) --log info -c agent-config.json.in @@ -120,7 +120,7 @@ install: all mkdir -p $(DESTDIR) && cp $(LOCAL_BINDIR)/* $(DESTDIR) vendor: tools/glide glide.yaml - ./tools/linux/glide install --strip-vendor + $(LOCAL_TOOLSDIR)/glide install --strip-vendor .PHONY: tools/glide tools/glide: -- 2.16.6