diff options
| author | Anton Samsonov <Anton.V.Samsonov@mcst.ru> | 2024-02-21 20:46:21 +0300 |
|---|---|---|
| committer | Anastasia Klimchuk <aklm@chromium.org> | 2024-02-25 10:49:17 +0000 |
| commit | 6d128a4fff73a39e7f1134579bfebe1a2c1f6146 (patch) | |
| tree | 8c4c0320c641b7488189812ee7146510036ebeab | |
| parent | 49fbdc7dd61a6add01e2de56e379fda54823cbab (diff) | |
| download | flashrom-6d128a4fff73a39e7f1134579bfebe1a2c1f6146.tar.gz flashrom-6d128a4fff73a39e7f1134579bfebe1a2c1f6146.tar.bz2 flashrom-6d128a4fff73a39e7f1134579bfebe1a2c1f6146.zip | |
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>
| -rw-r--r-- | Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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 |