deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #627 from ejoerns/pull-req/git-relstr-fix

Browse source 
Makefile.include: Fix git version string generation for external projects
This commit is contained in:
Oliver Schmidt 2014-04-09 22:20:47 +02:00
commit ea2c407aeb
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile.include
View file

@ -153,7 +153,7 @@ CFLAGS += ${addprefix -I,$(SOURCEDIRS) $(CONTIKI)}
### Check for a git repo and pass version if found ### Check for a git repo and pass version if found
### git.exe in Windows cmd shells may require no stderr redirection ### git.exe in Windows cmd shells may require no stderr redirection
#RELSTR=${shell git describe --tags} #RELSTR=${shell git describe --tags}
RELSTR=${shell git describe --tags 2>/dev/null} RELSTR=${shell git --git-dir ${CONTIKI}/.git describe --tags 2>/dev/null}
ifneq ($(RELSTR),) ifneq ($(RELSTR),)
CFLAGS += -DCONTIKI_VERSION_STRING=\"Contiki-$(RELSTR)\" CFLAGS += -DCONTIKI_VERSION_STRING=\"Contiki-$(RELSTR)\"
endif endif