From f56283837ea0ccd23a90af7f334d48c5b147bfc4 Mon Sep 17 00:00:00 2001 From: Bruce Hill Date: Sat, 26 Apr 2025 15:15:25 -0400 Subject: Put version tag in the tomo version --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b498cfbe..b3d4b141 100644 --- a/Makefile +++ b/Makefile @@ -49,7 +49,7 @@ OSFLAGS != case $(OS) in *BSD|Darwin) echo '-D_BSD_SOURCE';; Linux) echo '-D_GNU EXTRA= G=-ggdb O=-O3 -GIT_VERSION=$(shell git log -1 --pretty=format:'%as_%h') +GIT_VERSION=$(shell git log -1 --pretty=format:"$$(git describe --tags --abbrev=0)_%as_%h") CFLAGS=$(CCONFIG) $(INCLUDE_DIRS) $(EXTRA) $(CWARN) $(G) $(O) $(OSFLAGS) $(LTO) \ -DTOMO_HOME='"$(TOMO_HOME)"' -DTOMO_PREFIX='"$(PREFIX)"' -DDEFAULT_C_COMPILER='"$(DEFAULT_C_COMPILER)"' \ -DTOMO_VERSION='"$(GIT_VERSION)"' -- cgit v1.2.3