From 3cb66a5232b016eab536e62f9bbacd8a53ae6805 Mon Sep 17 00:00:00 2001 From: Niclas Finne Date: Fri, 27 Oct 2017 14:54:33 +0200 Subject: [PATCH] Changed version to Contiki-NG and mark the version as modified if the working tree has local modifications. --- Makefile.include | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.include b/Makefile.include index 5f3008244..7b503eabf 100644 --- a/Makefile.include +++ b/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