From 2d16b54fbec3fd803c523ecfbd0ebab3f3a1ff03 Mon Sep 17 00:00:00 2001 From: Matthew Newton Date: Tue, 10 Oct 2023 15:01:25 +0100 Subject: [PATCH] don't always try and be clever with the package version --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8c31dc6087..f41ad8ca13 100644 --- a/Makefile +++ b/Makefile @@ -75,7 +75,11 @@ else RADIUSD_VERSION_SEP := ~ endif -PKG_VERSION := $(RADIUSD_VERSION_MAJOR).$(RADIUSD_VERSION_MINOR)$(RADIUSD_VERSION_SEP)$(RADIUSD_VERSION_INCRM)$(PKG_VERSION_SUFFIX) +ifeq "$(shell ./version.sh is_release)" "1" + PKG_VERSION := $(shell cat VERSION) +else + PKG_VERSION := $(RADIUSD_VERSION_MAJOR).$(RADIUSD_VERSION_MINOR)$(RADIUSD_VERSION_SEP)$(RADIUSD_VERSION_INCRM)$(PKG_VERSION_SUFFIX) +endif .PHONY: pkg_version pkg_version: -- 2.47.3