mirror of
https://review.coreboot.org/flashrom.git
synced 2025-04-27 07:02:34 +02:00
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>
This commit is contained in:
parent
49fbdc7dd6
commit
6d128a4fff
4
Makefile
4
Makefile
@ -399,8 +399,10 @@ CLI_OBJS = cli_classic.o cli_output.o cli_common.o print.o
|
|||||||
|
|
||||||
VERSION ?= $(shell cat ./VERSION)
|
VERSION ?= $(shell cat ./VERSION)
|
||||||
VERSION_GIT ?= $(shell git describe 2>/dev/null)
|
VERSION_GIT ?= $(shell git describe 2>/dev/null)
|
||||||
ifdef VERSION_GIT
|
ifneq ($(VERSION_GIT),)
|
||||||
VERSION := "$(VERSION) (git:$(VERSION_GIT))"
|
VERSION := "$(VERSION) (git:$(VERSION_GIT))"
|
||||||
|
else
|
||||||
|
VERSION := "$(VERSION)"
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# No spaces in release names unless set explicitly
|
# No spaces in release names unless set explicitly
|
||||||
|
Loading…
x
Reference in New Issue
Block a user