From: divverent Date: Wed, 7 Jan 2009 13:20:08 +0000 (+0000) Subject: now using "sed" to cut off the version X-Git-Tag: svn-r421~264 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5703b5a6eafff14a4f8b74b037b7578b3c050584;p=xonotic%2Fnetradiant.git now using "sed" to cut off the version git-svn-id: svn://svn.icculus.org/netradiant/trunk@156 61c419a2-8eb2-4b30-bcec-8cead039b335 --- diff --git a/Makefile b/Makefile index b7918bdf..e1d1fbd7 100644 --- a/Makefile +++ b/Makefile @@ -42,6 +42,7 @@ TEE_STDERR ?= | tee /dev/stderr TR ?= tr FIND ?= find DIFF ?= diff +SED ?= sed # optional: SVNVERSION ?= svnversion @@ -175,7 +176,7 @@ RADIANT_VERSION = 1.5.0 RADIANT_MAJOR_VERSION = 5 RADIANT_MINOR_VERSION = 0 -SVN_VERSION := $(shell $(SVNVERSION) -n $(STDERR_TO_DEVNULL) | $(TR) -cd 0-9:) +SVN_VERSION := $(shell $(SVNVERSION) -n $(STDERR_TO_DEVNULL) | $(SED) 's/M$$//g; s/.*://g;') ifneq ($(SVN_VERSION),) RADIANT_VERSION := $(RADIANT_VERSION)-svn$(SVN_VERSION) endif @@ -221,7 +222,7 @@ dependencies-check: checkbinary coreutils "$(RM)"; \ checkbinary coreutils "$(RM_R)"; \ checkbinary coreutils "$(ECHO) test $(TEE_STDERR)"; \ - checkbinary coreutils "$(TR)"; \ + checkbinary sed "$(SED)"; \ checkbinary findutils "$(FIND)"; \ checkbinary diff "$(DIFF)"; \ checkbinary gcc "$(CC)"; \