From: Matthew Newton <matthew-git@newtoncomputing.co.uk>
Date: Tue, 10 Oct 2023 14:01:25 +0000 (+0100)
Subject: don't always try and be clever with the package version
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d16b54fbec3fd803c523ecfbd0ebab3f3a1ff03;p=thirdparty%2Ffreeradius-server.git

don't always try and be clever with the package version
---

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: