diff options
| author | glx <glx@openttd.org> | 2007-11-18 22:37:44 +0000 |
|---|---|---|
| committer | glx <glx@openttd.org> | 2007-11-18 22:37:44 +0000 |
| commit | 25a636d6cd614367099c8b38456abfeec49fdc9d (patch) | |
| tree | b91d8d22a2db1491a31a34aae273732e933ec47b | |
| parent | e54937969079407bb62115d25b295f796b6fa340 (diff) | |
| download | openttd-25a636d6cd614367099c8b38456abfeec49fdc9d.tar.xz | |
(svn r11469) -Fix (r11051): only consider changes in src when detecting modified (M) version
| -rw-r--r-- | Makefile.src.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.src.in b/Makefile.src.in index 2cb3059ae..9ca235d5b 100644 --- a/Makefile.src.in +++ b/Makefile.src.in @@ -105,7 +105,7 @@ else # Are we a git dir? ifeq ($(shell if test -d $(SRC_DIR)/../.git; then echo 1; fi), 1) # Find the revision like: gXXXXM-branch -REV := g$(shell if head=`LC_ALL=C 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=`LC_ALL=C git rev-parse --verify HEAD 2>/dev/null`; then echo "$$head" | cut -c1-8; fi)$(shell if cd "$(SRC_DIR)/.." && git diff-index HEAD src | read dummy; then echo M; fi)$(shell git branch|grep '[*]' | sed 's/\* /-/;s/^-master$$//') REV_NR := $(shell LC_ALL=C cd "$(SRC_DIR)/.." && git log --pretty=format:%s src | grep -m 1 "^(svn r[0-9]*)" | sed "s/.*(svn r\([0-9]*\)).*/\1/" ) else # Are we a hg (Mercurial) dir? |