diff options
| author | truebrain <truebrain@openttd.org> | 2008-09-06 12:54:11 +0000 |
|---|---|---|
| committer | truebrain <truebrain@openttd.org> | 2008-09-06 12:54:11 +0000 |
| commit | a42bef612e04a0a78ca8546b866ba3c809c35da3 (patch) | |
| tree | bdf592eabc60c980585025e538c5c73a5f49831b | |
| parent | 521afee0448d39571d99c4ddd59200e5e200ad44 (diff) | |
| download | openttd-a42bef612e04a0a78ca8546b866ba3c809c35da3.tar.xz | |
(svn r14255) -Fix [configure]: remove the requirement to have a recent enough 'grep' which understands -m. Instead, use 'head -n 1' which is more common available
| -rw-r--r-- | Makefile.src.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.src.in b/Makefile.src.in index 585a4cd45..5202809e2 100644 --- a/Makefile.src.in +++ b/Makefile.src.in @@ -129,13 +129,13 @@ else 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)$(REV_MODIFIED)$(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/" ) +REV_NR := $(shell LC_ALL=C cd "$(SRC_DIR)/.." && git log --pretty=format:%s src | grep "^(svn r[0-9]*)" | head -n 1 | sed "s/.*(svn r\([0-9]*\)).*/\1/" ) 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 -d: -f3 | cut -c1-8; fi)$(REV_MODIFIED)$(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 -m 1 "^(svn r[0-9]*)" | sed "s/.*(svn r\([0-9]*\)).*/\1/" ) +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 endif |