Merge pull request #1847 from wy65701436/dev

fix git tag bug
This commit is contained in:
Daniel Jiang 2017-03-29 09:33:41 +08:00 committed by GitHub
commit 3fc21f7d81

View File

@ -168,7 +168,7 @@ VERSIONFILEPATH=$(CURDIR)
VERSIONFILENAME=VERSION VERSIONFILENAME=VERSION
GITCMD=$(shell which git) GITCMD=$(shell which git)
GITTAG=$(GITCMD) describe --tags GITTAG=$(GITCMD) describe --tags
GITTAGVERSION=$(shell $(GITTAG)) GITTAGVERSION=$(shell git describe --tags || echo UNKNOWN)
ifeq ($(DEVFLAG), true) ifeq ($(DEVFLAG), true)
VERSIONTAG=dev VERSIONTAG=dev
else else