Merge branch 'makefile' into Alpha
This commit is contained in:
commit
05b25c334f
1 changed files with 1 additions and 1 deletions
2
Makefile
2
Makefile
|
@ -5,7 +5,7 @@ ifeq ($(BRANCH),Alpha)
|
||||||
VERSION=alpha-$(shell git rev-parse --short HEAD)
|
VERSION=alpha-$(shell git rev-parse --short HEAD)
|
||||||
else ifeq ($(BRANCH),Beta)
|
else ifeq ($(BRANCH),Beta)
|
||||||
VERSION=beta-$(shell git rev-parse --short HEAD)
|
VERSION=beta-$(shell git rev-parse --short HEAD)
|
||||||
else ifeq ($(BRANCH),HEAD)
|
else ifeq ($(BRANCH),)
|
||||||
VERSION=$(shell git describe --tags)
|
VERSION=$(shell git describe --tags)
|
||||||
else
|
else
|
||||||
VERSION=unknown
|
VERSION=unknown
|
||||||
|
|
Loading…
Reference in a new issue