Merge pull request #2458 from ipfs/makefile-fixes

Makefile fixes

Makefile

@@ -29,7 +29,7 @@ gxgo_upgrade:
 	go get -u github.com/whyrusleeping/gx-go
 
 path_check:
-	@bin/check_go_path $(realpath $(shell pwd))
+	@bin/check_go_path $(realpath $(shell pwd)) $(realpath $(GOPATH)/src/github.com/ipfs/go-ipfs)
 
 gx_check:
 	@bin/check_gx_program "gx" "0.3" 'Upgrade or install gx using your package manager or run `make gx_upgrade`'
@@ -44,7 +44,7 @@ deps: go_check gx_check path_check
 vendor: godep
 	godep save -r ./...
 
-install: build
+install: deps
 	cd cmd/ipfs && go install -ldflags=$(ldflags)
 
 build: deps

bin/check_go_path

 #!/bin/sh
 
 PWD=$1
+EXPECTED=$2
 
 if [ -z "$PWD" ]; then
 	echo "must pass in your current working directory"
@@ -12,8 +13,6 @@ if [ -z "$GOPATH" ]; then
 	exit 1
 fi
 
-EXPECTED="$GOPATH/src/github.com/ipfs/go-ipfs"
-
 if [ "$PWD" != "$EXPECTED" ]; then
 	echo "go-ipfs must be built from within your \$GOPATH directory."
 	echo "expected '$EXPECTED' but got '$PWD'"