Merge branch 'develop' into contrib/build/remove-obsolete-makefile

2018-04-03 11:59:21 +02:00 · 2018-04-03 11:59:21 +02:00 · b9f31813c2
commit b9f31813c2
parent 46f73b9a8a 1d216c9e9a
1 changed files with 2 additions and 1 deletions
--- a/Makefile.include
+++ b/Makefile.include
@ -263,7 +263,8 @@ CFLAGS += ${addprefix -I,$(SOURCEDIRS) $(CONTIKI)}
 ### Check for a git repo and pass version if found
 ### git.exe in Windows cmd shells may require no stderr redirection
 ifndef RELSTR
-RELSTR:=${shell git --git-dir ${CONTIKI}/.git describe --tags --always --dirty}
+RELSTR:=${shell git --git-dir ${CONTIKI}/.git --work-tree ${CONTIKI} describe \
+          --tags --always --dirty}
 endif

 ifneq ($(RELSTR),)