From 6d128a4fff73a39e7f1134579bfebe1a2c1f6146 Mon Sep 17 00:00:00 2001
From: Anton Samsonov <Anton.V.Samsonov@mcst.ru>
Date: Wed, 21 Feb 2024 20:46:21 +0300
Subject: [PATCH] Makefile: Fix version string for non-Git builds

Match the version string for `make` builds to that of `meson` builds
from both Git- and non-Git (release or current snapshot) source trees.

Change-Id: I8694e618878823a9e96b1f2bcfa63f6c71d3c2ed
Signed-off-by: Anton Samsonov <devel@zxlab.ru>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/79152
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
---
 Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index a36e575df..9ce590681 100644
--- a/Makefile
+++ b/Makefile
@@ -399,8 +399,10 @@ CLI_OBJS = cli_classic.o cli_output.o cli_common.o print.o
 
 VERSION ?= $(shell cat ./VERSION)
 VERSION_GIT ?= $(shell git describe 2>/dev/null)
-ifdef VERSION_GIT
+ifneq ($(VERSION_GIT),)
   VERSION := "$(VERSION) (git:$(VERSION_GIT))"
+else
+  VERSION := "$(VERSION)"
 endif
 
 # No spaces in release names unless set explicitly