quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

now using "sed" to cut off the version

Browse Source 
git-svn-id: svn://svn.icculus.org/netradiant/trunk@156 61c419a2-8eb2-4b30-bcec-8cead039b335
This commit is contained in:
divverent 2009-01-07 13:20:08 +00:00
parent c3e0933463
commit 5703b5a6ea
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -42,6 +42,7 @@ TEE_STDERR ?= | tee /dev/stderr
TR ?= tr TR ?= tr
FIND ?= find FIND ?= find
DIFF ?= diff DIFF ?= diff
SED ?= sed
# optional: # optional:
SVNVERSION ?= svnversion SVNVERSION ?= svnversion
@ -175,7 +176,7 @@ RADIANT_VERSION = 1.5.0
RADIANT_MAJOR_VERSION = 5 RADIANT_MAJOR_VERSION = 5
RADIANT_MINOR_VERSION = 0 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),) ifneq ($(SVN_VERSION),)
RADIANT_VERSION := $(RADIANT_VERSION)-svn$(SVN_VERSION) RADIANT_VERSION := $(RADIANT_VERSION)-svn$(SVN_VERSION)
endif endif
@ -221,7 +222,7 @@ dependencies-check:
checkbinary coreutils "$(RM)"; \ checkbinary coreutils "$(RM)"; \
checkbinary coreutils "$(RM_R)"; \ checkbinary coreutils "$(RM_R)"; \
checkbinary coreutils "$(ECHO) test $(TEE_STDERR)"; \ checkbinary coreutils "$(ECHO) test $(TEE_STDERR)"; \
checkbinary coreutils "$(TR)"; \ checkbinary sed "$(SED)"; \
checkbinary findutils "$(FIND)"; \ checkbinary findutils "$(FIND)"; \
checkbinary diff "$(DIFF)"; \ checkbinary diff "$(DIFF)"; \
checkbinary gcc "$(CC)"; \ checkbinary gcc "$(CC)"; \