Merge pull request #346 from anthraxx/master

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

 COMPTIME                 := $(shell date +%s)
-VERSION_TAG              := $(shell git describe --tags --dirty=+)
+VERSION_TAG              := $(shell git describe --tags --dirty=+ || echo '$Format:%D$'|sed -r 's/.* ([^ ]+$)/\1/')

 ##
 ## Compiler flags