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

diff --git a/Makefile b/Makefile
index 8c31dc60876259efa2d9672d5edd6b53c9baa57a..f41ad8ca1354a6a8e4c0132d19840b0588478217 100644 (file)
--- 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: