summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorglx <glx@openttd.org>2007-06-07 13:40:20 +0000
committerglx <glx@openttd.org>2007-06-07 13:40:20 +0000
commitb73cd3c12d8dd7b44b4ed8e472f978c0b3510289 (patch)
tree79a2967cb6d0c9519d4b571acd507482330ba1e1
parent622a4d10b92e5ab843a9f9989cc36b8e2705e492 (diff)
downloadopenttd-b73cd3c12d8dd7b44b4ed8e472f978c0b3510289.tar.xz
(svn r10057) -Fix (r10051): git version detection didn't work for mingw/msys
-rw-r--r--Makefile.src.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.src.in b/Makefile.src.in
index 14d827d3b..dbd92f41e 100644
--- a/Makefile.src.in
+++ b/Makefile.src.in
@@ -100,7 +100,7 @@ else
# Are we a git dir?
ifeq ($(shell if test -d $(SRC_DIR)/../.git; then echo 1; fi), 1)
# Find the revision like: rXXXXM
-REV := g$(shell if head=`git rev-parse --verify HEAD 2>/dev/null`; then echo "$$head" | cut -c1-8; fi)$(shell if git diff-index HEAD | read dummy; then echo M; fi)$(shell git branch|grep '*'|sed 's/\* /-/;s/^-master$$//')
+REV := g$(shell if head=`git rev-parse --verify HEAD 2>/dev/null`; then echo "$$head" | cut -c1-8; fi)$(shell if git diff-index HEAD | read dummy; then echo M; fi)$(shell git branch|grep '[*]'|sed 's/\* /-/;s/^-master$$//')
endif
endif
endif