diff options
| author | planetmaker <planetmaker@openttd.org> | 2014-12-11 12:25:53 +0000 |
|---|---|---|
| committer | planetmaker <planetmaker@openttd.org> | 2014-12-11 12:25:53 +0000 |
| commit | 24fec6da12fbc7ba4c9050f8afa5f05970c346bb (patch) | |
| tree | 07ae5b7ab6e39d0ed50a239a9e0269b5bc07e079 /findversion.sh | |
| parent | 141b5d7050933eac015fb64bb32f006ade4124f9 (diff) | |
| download | openttd-24fec6da12fbc7ba4c9050f8afa5f05970c346bb.tar.xz | |
(svn r27079) -Fix: Compilation with freetype2 version 2.5.4 and newer (AMDmi3)
Diffstat (limited to 'findversion.sh')
| -rwxr-xr-x | findversion.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/findversion.sh b/findversion.sh index 362d9b545..6be52b696 100755 --- a/findversion.sh +++ b/findversion.sh @@ -112,15 +112,15 @@ elif [ -d "$ROOT_DIR/.hg" ]; then HASH=`LC_ALL=C HGPLAIN= hg id -i | cut -c1-12` REV="h`echo $HASH | cut -c1-8`" BRANCH="`HGPLAIN= hg branch | sed 's@^default$@@'`" - TAG="`hg id -t | grep -v 'tip$'`" + TAG="`HGPLAIN= hg id -t | grep -v 'tip$'`" if [ -n "$TAG" ]; then BRANCH="" REV="$TAG" fi - REV_NR=`LC_ALL=C hg log -f -k "(svn r" -l 1 --template "{desc|firstline}\n" | grep "^(svn r[0-9]*)" | sed "s@.*(svn r\([0-9]*\)).*@\1@"` + REV_NR=`LC_ALL=C HGPLAIN= hg log -f -k "(svn r" -l 1 --template "{desc|firstline}\n" | grep "^(svn r[0-9]*)" | sed "s@.*(svn r\([0-9]*\)).*@\1@"` if [ -z "$REV_NR" ]; then # No rev? Maybe it is a custom hgsubversion clone - REV_NR=`LC_ALL=C hg parent --template="{svnrev}"` + REV_NR=`LC_ALL=C HGPLAIN= hg parent --template="{svnrev}"` fi elif [ -f "$ROOT_DIR/.ottdrev" ]; then # We are an exported source bundle |