Merge pull request #348 from anthraxx/master

fallback for Makefile version if its not a git checkout (tarball) (re…
8 years ago · 18a061897f
parent d37b6c6c30 3828ea354c
commit 18a061897f
2 changed files with 3 additions and 1 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -0,0 +1 @@
+src/Makefile export-subst
--- a/src/Makefile
+++ b/src/Makefile
@ -80,7 +80,8 @@ CC_WIN_64                := x86_64-w64-mingw32-gcc
 ##

 COMPTIME                 := $(shell date +%s)
-VERSION_TAG              := $(shell git describe --tags --dirty=+)
+VERSION_EXPORT           := $Format:%D$
+VERSION_TAG              := $(shell test -d .git && git describe --tags --dirty=+ || echo "$(VERSION_EXPORT)"|cut -d, -f2|sed -r 's|.* (\w+/)?([^ ]+)|\2|')

 ##
 ## Compiler flags