Merge branch 'master' into feature/cleanup-gitlab

This commit is contained in:
Manuel Friedli 2016-01-02 01:57:06 +01:00
commit bff443223c
11 changed files with 43 additions and 24 deletions

View file

@ -6,7 +6,7 @@ index c2c8c59..419f4d8 100644
-PREFIX=/usr/local
-VERSION=$(shell git describe)-$(shell date -u +%Y%m%d.%H%M%S)
+PREFIX=${DESTDIR}/usr
+VERSION=0.4.2-$(shell date -u +%Y%m%d.%H%M%S)
+VERSION=0.5.1-$(shell date -u +%Y%m%d.%H%M%S)
gitlab-workhorse: $(wildcard *.go)
- go build -ldflags "-X main.Version ${VERSION}" -o gitlab-workhorse