Improve Makefile

Now you can use 'make update' which will update micro and all the
dependencies (but won't rebuild). The makefile also now supports
having a $GOBIN variable and having multiple directories in your
$GOPATH.

diff --git a/Makefile b/Makefile
index 40926ffc13989d9a14c0058ddbe0572050bd9c61..8b4187a2318e5bfe527db33d6d81edd7e1e1598b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,10 @@ VERSION = $(shell go run tools/build-version.go)
 HASH = $(shell git rev-parse --short HEAD)
 DATE = $(shell go run tools/build-date.go)
 
+GOBIN ?= $($GOPATH)/bin
+
 # Builds micro after checking dependencies but without updating the runtime
-build: deps tcell
+build: deps
        go build -ldflags "-s -w -X main.Version=$(VERSION) -X main.CommitHash=$(HASH) -X 'main.CompileDate=$(DATE)'" ./cmd/micro
 
 # Builds micro after building the runtime and checking dependencies
@@ -15,31 +17,29 @@ build-all: runtime build
 build-quick:
        go build -ldflags "-s -w -X main.Version=$(VERSION) -X main.CommitHash=$(HASH) -X 'main.CompileDate=$(DATE)'" ./cmd/micro
 
-# Same as 'build' but installs to $GOPATH/bin afterward
-install: build
-       mkdir -p $(GOPATH)/bin
-       mv micro $(GOPATH)/bin
+# Same as 'build' but installs to $GOBIN afterward
+install: deps
+       go install -ldflags "-s -w -X main.Version=$(VERSION) -X main.CommitHash=$(HASH) -X 'main.CompileDate=$(DATE)'" ./cmd/micro
 
-# Same as 'build-all' but installs to $GOPATH/bin afterward
+# Same as 'build-all' but installs to $GOBIN afterward
 install-all: runtime install
 
-# Same as 'build-quick' but installs to $GOPATH/bin afterward
-install-quick: build-quick
-       mkdir -p $(GOPATH)/bin
-       mv micro $(GOPATH)/bin
-
-# Updates tcell
-tcell:
-       git -C $(GOPATH)/src/github.com/zyedidia/tcell pull
+# Same as 'build-quick' but installs to $GOBIN afterward
+install-quick:
+       go install -ldflags "-s -w -X main.Version=$(VERSION) -X main.CommitHash=$(HASH) -X 'main.CompileDate=$(DATE)'" ./cmd/micro
 
 # Checks for dependencies
 deps:
        go get -d ./cmd/micro
 
+update:
+       git pull
+       go get -u -d ./cmd/micro
+
 # Builds the runtime
 runtime:
        go get -u github.com/jteeuwen/go-bindata/...
-       $(GOPATH)/bin/go-bindata -nometadata -o runtime.go runtime/...
+       $(GOBIN)/go-bindata -nometadata -o runtime.go runtime/...
        mv runtime.go cmd/micro
 
 test: