diff options
| author | glx <glx@openttd.org> | 2008-08-14 15:37:52 +0000 |
|---|---|---|
| committer | glx <glx@openttd.org> | 2008-08-14 15:37:52 +0000 |
| commit | 9b2919852a73ba1efdbfa67c5bf5a50d083c6c3f (patch) | |
| tree | ab5e9dffccef56f275b520a1cb28c6939a65fe39 | |
| parent | 75ea55cc65e9d0d7fd504fbda5b7116fbeb10746 (diff) | |
| download | openttd-9b2919852a73ba1efdbfa67c5bf5a50d083c6c3f.tar.xz | |
(svn r14072) -Fix (r14053): branch detection failed with mawk (peter1138)
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | Makefile.src.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index d63a0fdd6..881824ab7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -156,7 +156,7 @@ ifeq ($(shell if test -d $(SRC_DIR)/.svn; then echo 1; fi), 1) # Find if the local source if modified REV_MODIFIED := $(shell svnversion $(SRC_DIR) | sed -n 's/.*\(M\).*/\1/p' ) # Find the revision like: rXXXX-branch -REV := $(shell LC_ALL=C svn info $(SRC_DIR) | $(AWK) '/^URL:.*branches/ { split($$2, a, "/"); i=1; while(i<length(a) && a[i++]!="branches"); BRANCH="-"a[i] } /^Last Changed Rev:/ { REV="r"$$4"$(REV_MODIFIED)" } END { print REV BRANCH }') +REV := $(shell LC_ALL=C svn info $(SRC_DIR) | $(AWK) '/^URL:.*branches/ { split($$2, a, "/"); for (i in a) if(a[i]=="branches") { BRANCH="-"a[i+1]; break } } /^Last Changed Rev:/ { REV="r"$$4"$(REV_MODIFIED)" } END { print REV BRANCH }') endif endif # Make sure we have something in REV diff --git a/Makefile.src.in b/Makefile.src.in index 0c32e89e3..868db8850 100644 --- a/Makefile.src.in +++ b/Makefile.src.in @@ -124,7 +124,7 @@ else ifeq ($(shell if test -d $(SRC_DIR)/.svn; then echo 1; fi), 1) # Find if the local source if modified # Find the revision like: rXXXX-branch -REV := $(shell LC_ALL=C svn info $(SRC_DIR) | $(AWK) '/^URL:.*branch/ { split($$2, a, "/"); i=1; while(i<length(a) && a[i++]!="branches"); BRANCH="-"a[i] } /^Last Changed Rev:/ { REV="r"$$4"$(REV_MODIFIED)" } END { print REV BRANCH }') +REV := $(shell LC_ALL=C svn info $(SRC_DIR) | $(AWK) '/^URL:.*branches/ { split($$2, a, "/"); for(i in a) if (a[i]=="branches") { BRANCH="-"a[i+1]; break } } /^Last Changed Rev:/ { REV="r"$$4"$(REV_MODIFIED)" } END { print REV BRANCH }') REV_NR := $(shell LC_ALL=C svn info $(SRC_DIR) | $(AWK) '/^Last Changed Rev:/ { print $$4 }') else # Are we a git dir? |