diff options
| author | matthijs <matthijs@openttd.org> | 2008-09-08 06:27:08 +0000 |
|---|---|---|
| committer | matthijs <matthijs@openttd.org> | 2008-09-08 06:27:08 +0000 |
| commit | 157b625263fb0a4ca94d1c726fb8dcaf799e1a81 (patch) | |
| tree | 6c07dc5fc8fcae16284771881519cffa8c4f2db6 | |
| parent | 0a4090b8a73d74261f427e38144ea27977f5c80f (diff) | |
| download | openttd-157b625263fb0a4ca94d1c726fb8dcaf799e1a81.tar.xz | |
(svn r14272) -Fix [Makefile]: Always pass an explicit delimiter to the "cut" command, in
case there are platforms where tab is not the default.
| -rw-r--r-- | Makefile.bundle.in | 2 | ||||
| -rw-r--r-- | Makefile.src.in | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.bundle.in b/Makefile.bundle.in index 8558912b2..94e8d830e 100644 --- a/Makefile.bundle.in +++ b/Makefile.bundle.in @@ -8,7 +8,7 @@ REV := $(REVISION) else # Detect the revision VERSIONS := $(shell AWK="$(AWK)" "$(ROOT_DIR)/findversion.sh") -REV := $(shell echo "$(VERSIONS)" | cut -f 1) +REV := $(shell echo "$(VERSIONS)" | cut -f 1 -d' ') endif # Make sure we have something in REV diff --git a/Makefile.src.in b/Makefile.src.in index 98e06abcb..e93d064b7 100644 --- a/Makefile.src.in +++ b/Makefile.src.in @@ -91,7 +91,7 @@ $(LANG_OBJS_DIR)/table/strings.h: $(LANG_DIR)/english.txt $(LANG_OBJS_DIR)/$(STR # Always run version detection, so we always have an accurate modified # flag VERSIONS := $(shell AWK="$(AWK)" "$(ROOT_DIR)/findversion.sh") -MODIFIED := $(shell echo "$(VERSIONS)" | cut -f 3) +MODIFIED := $(shell echo "$(VERSIONS)" | cut -f 3 -d' ') ifdef REVISION # Use specified revision (which should be of the form "r000"). @@ -99,8 +99,8 @@ REV := $(REVISION) REV_NR := $(shell echo $(REVISION) | sed "s/[^0-9]//g") else # Use autodetected revisions -REV := $(shell echo "$(VERSIONS)" | cut -f 1) -REV_NR := $(shell echo "$(VERSIONS)" | cut -f 2) +REV := $(shell echo "$(VERSIONS)" | cut -f 1 -d' ') +REV_NR := $(shell echo "$(VERSIONS)" | cut -f 2 -d' ') endif # Make sure we have something in REV and REV_NR |