@@ -15,26 +15,27 @@ ROOT := $(shell pwd)
 
 all: build
 
-SOURCEDIR=./ecs-cli
+SOURCEDIR := ./ecs-cli
 SOURCES := $(shell find $(SOURCEDIR) -name '*.go')
-LOCAL_BINARY=bin/local/ecs-cli
-LINUX_BINARY=bin/linux-amd64/ecs-cli
-DARWIN_BINARY=bin/darwin-amd64/ecs-cli
+LOCAL_BINARY := bin/local/ecs-cli
+LINUX_BINARY := bin/linux-amd64/ecs-cli
+DARWIN_BINARY := bin/darwin-amd64/ecs-cli
+LOCAL_PATH := $(ROOT)/scripts:${PATH}
 
 .PHONY: build
 build: $(LOCAL_BINARY)
 
 $(LOCAL_BINARY): $(SOURCES)
-	. ./scripts/shared_env && ./scripts/build_binary.sh ./bin/local
+	./scripts/build_binary.sh ./bin/local
 	@echo "Built ecs-cli"
 
 .PHONY: test
 test:
-	. ./scripts/shared_env && env -i PATH=$$PATH GOPATH=$$GOPATH GOROOT=$$GOROOT go test -timeout=120s -v -cover ./ecs-cli/license/... ./ecs-cli/modules/...
+	env -i PATH=$$PATH GOPATH=$$GOPATH GOROOT=$$GOROOT go test -timeout=120s -v -cover ./ecs-cli/license/... ./ecs-cli/modules/...
 
 .PHONY: generate
 generate: $(SOURCES)
-	. ./scripts/shared_env && go generate ./ecs-cli/license/... ./ecs-cli/modules/...
+	PATH=$(LOCAL_PATH) go generate ./ecs-cli/license/... ./ecs-cli/modules/...
 
 .PHONY: generate-deps
 generate-deps:
@@ -61,12 +62,12 @@ supported-platforms: $(LINUX_BINARY) $(DARWIN_BINARY)
 
 $(LINUX_BINARY): $(SOURCES)
 	@mkdir -p ./bin/linux-amd64
-	. ./scripts/shared_env && TARGET_GOOS=linux GOARCH=amd64 ./scripts/build_binary.sh ./bin/linux-amd64
+	TARGET_GOOS=linux GOARCH=amd64 ./scripts/build_binary.sh ./bin/linux-amd64
 	@echo "Built ecs-cli for linux"
 
 $(DARWIN_BINARY): $(SOURCES)
 	@mkdir -p ./bin/darwin-amd64
-	. ./scripts/shared_env && TARGET_GOOS=darwin GOARCH=amd64 ./scripts/build_binary.sh ./bin/darwin-amd64
+	TARGET_GOOS=darwin GOARCH=amd64 ./scripts/build_binary.sh ./bin/darwin-amd64
 	@echo "Built ecs-cli for darwin"
 
 .PHONY: clean