From 1328f8bec73a0924e00c7d7f28c8059628ed351e Mon Sep 17 00:00:00 2001 From: David Wragg Date: Mon, 13 Apr 2015 20:39:01 +0100 Subject: [PATCH] Use $(@D) rather than $(shell dirname $@) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 496eb684..f81a62a7 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ update: $(WEAVER_EXE) $(WEAVEDNS_EXE): common/*.go go get -tags netgo ./$(@D) - go build -ldflags "-extldflags \"-static\" -X main.version $(WEAVE_VERSION)" -tags netgo -o $@ ./$(shell dirname $@) + go build -ldflags "-extldflags \"-static\" -X main.version $(WEAVE_VERSION)" -tags netgo -o $@ ./$(@D) @strings $@ | grep cgo_stub\\\.go >/dev/null || { \ rm $@; \ echo "\nYour go standard library was built without the 'netgo' build tag."; \ @@ -47,7 +47,7 @@ $(WEAVEDNS_EXE): nameserver/*.go weavedns/main.go # Sigproxy needs separate rule as it fails the netgo check in the main # build stanza due to not importing net package $(SIGPROXY_EXE): sigproxy/main.go - go build -o $@ ./$(shell dirname $@) + go build -o $@ ./$(@D) $(WEAVER_EXPORT): weaver/Dockerfile $(WEAVER_EXE) $(SUDO) docker build -t $(WEAVER_IMAGE) weaver