riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make: make RIOT_VERSION fail-safe

Browse Source
This commit is contained in:
Ludwig Ortmann 2014-07-30 15:33:07 +02:00
parent 76601dbf46
commit 9d9d2aff93
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.include
View File

@ -65,7 +65,7 @@ include $(RIOTBASE)/Makefile.cflags
# make the RIOT version available to the program # make the RIOT version available to the program
ifeq ($(origin RIOT_VERSION), undefined) ifeq ($(origin RIOT_VERSION), undefined)
GIT_STRING := $(shell git describe --always --abbrev=4 --dirty=-`hostname`) GIT_STRING := $(shell git describe --always --abbrev=4 --dirty=-`hostname` 2> /dev/null)
ifneq (,$(GIT_STRING)) ifneq (,$(GIT_STRING))
GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD) GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
ifeq ($(strip $(GIT_BRANCH)),master) ifeq ($(strip $(GIT_BRANCH)),master)