Merge pull request #406 from g-oikonomou/bugfix/always-dirty

Fix CONTIKI_TARGET_STRING
2018-04-03 11:58:56 +02:00 · 2018-04-03 11:58:56 +02:00 · 1d216c9e9a
commit 1d216c9e9a
parent 18a2a49d66 e78b2376c6
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),)