Merge pull request #117 from nfi/contrib/mark-version-as-modified

Updated the Contiki version and mark the version as modified if the working tree has local modifications.

Makefile.include

@@ -220,13 +220,13 @@ 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}
+RELSTR:=${shell git --git-dir ${CONTIKI}/.git describe --tags --always --dirty}
 endif
 
 ifneq ($(RELSTR),)
-CFLAGS += -DCONTIKI_VERSION_STRING=\"Contiki-$(RELSTR)\"
+CFLAGS += -DCONTIKI_VERSION_STRING=\"Contiki-NG-$(RELSTR)\"
 else
-CFLAGS += -DCONTIKI_VERSION_STRING=\"Contiki-3.x\"
+CFLAGS += -DCONTIKI_VERSION_STRING=\"Contiki-NG\"
 endif
 
 ### Automatic dependency generation