diff options
| author | glx <glx@openttd.org> | 2007-10-21 17:19:18 +0000 |
|---|---|---|
| committer | glx <glx@openttd.org> | 2007-10-21 17:19:18 +0000 |
| commit | c66bbda3ec1f54ca8974cb571d001449cd03c9ac (patch) | |
| tree | 9d27da3af287f6e978fad05018a113ac96db9813 | |
| parent | 4fdfd76b3b22ebb7c4d8c33a89c33224c8bf6d12 (diff) | |
| download | openttd-c66bbda3ec1f54ca8974cb571d001449cd03c9ac.tar.xz | |
(svn r11335) -Fix (r11148): 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 d6d498546..eb57a0b8f 100644 --- a/Makefile.src.in +++ b/Makefile.src.in @@ -111,7 +111,7 @@ else # Are we a hg (Mercurial) dir? ifeq ($(shell if test -d $(SRC_DIR)/../.hg; then echo 1; fi), 1) # Find the revision like: hXXXXM-branch -REV := h$(shell if head=`LC_ALL=C hg tip 2>/dev/null`; then echo "$$head" | head -n 1 | cut -c19-26; fi)$(shell if hg status | grep -v '^?' | read dummy; then echo M; fi)$(shell hg branch | sed 's/^/-/;s/^-default$$//') +REV := h$(shell if head=`LC_ALL=C hg tip 2>/dev/null`; then echo "$$head" | head -n 1 | cut -c19-26; fi)$(shell if hg status $(SRC_DIR) | grep -v '^?' | read dummy; then echo M; fi)$(shell hg branch | sed 's/^/-/;s/^-default$$//') REV_NR := $(shell LC_ALL=C hg log -k "svn" -l 1 --template "{desc}\n" $(SRC_DIR) | grep "^(svn r[0-9]*)" | head -n 1 | sed "s/.*(svn r\([0-9]*\)).*/\1/" ) endif endif |