From fcfec5c972253795de33e5243fe3294d20588d59 Mon Sep 17 00:00:00 2001 From: Harsh Sharma Date: Thu, 3 Oct 2019 14:28:42 -0500 Subject: Changed version string to based on just git describe --- lora_pkt_fwd/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lora_pkt_fwd/Makefile b/lora_pkt_fwd/Makefile index 069fc0a..7e8b63c 100644 --- a/lora_pkt_fwd/Makefile +++ b/lora_pkt_fwd/Makefile @@ -15,15 +15,14 @@ INCLUDES = $(wildcard inc/*.h) # must get library build option to know if mpsse must be linked or not include $(LGW_PATH)/library.cfg -RELEASE_VERSION := $(shell git describe) -RELEASE_COMMIT := $(shell git rev-parse --short HEAD) +VERSION_STRING := $(shell git describe) ### Constant symbols CC := $(CROSS_COMPILE)gcc AR := $(CROSS_COMPILE)ar MORECFLAGS := -Wall -Wextra -std=c99 -Iinc -I. -isystem =/usr/include/gps -VFLAG := -D VERSION_STRING="\"$(RELEASE_VERSION)-$(RELEASE_COMMIT)\"" +VFLAG := -D VERSION_STRING="\"$(VERSION_STRING)\"" ### Constants for Lora concentrator HAL library # List the library sub-modules that are used by the application -- cgit v1.2.3