From c0c21f7daf0d0bed7ece3e03c36d092e9c20a10c Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Sun, 14 Jun 2020 12:33:59 +0200
Subject: [PATCH] - configure: change release cycle handling; we don't need two
 defines for release cycle

Signed-off-by: GetAway <get-away@t-online.de>
---
 configure.ac             | 5 ++---
 src/gui/update.cpp       | 2 +-
 src/system/flashtool.cpp | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4ee249e38..e9c0ce359 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 define(ver_major, 3)
 define(ver_minor, 11)
 define(ver_micro, 1)
-define(neutrino_rel_cycle, ver_major.ver_minor)
+define(rel_cycle, "ver_major.0")
 
 # sync with current git
 define(ver_git, m4_esyscmd([
@@ -20,14 +20,13 @@ AC_INIT(Tuxbox-Neutrino,ver_major.ver_minor.ver_micro)
 AM_INIT_AUTOMAKE([nostdinc foreign])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
 
-AC_DEFINE(RELEASE_CYCLE, "3.0", [Release cycle information; used in update code; only relevant for flash image releases ])
+AC_DEFINE(PACKAGE_RELEASE_CYCLE, rel_cycle, [Release cycle information; used in update code; only relevant for flash image releases ])
 
 AC_DEFINE(PACKAGE_VERSION_MAJOR, ver_major, [Major version number])
 AC_DEFINE(PACKAGE_VERSION_MINOR, ver_minor, [Minor version number])
 AC_DEFINE(PACKAGE_VERSION_MICRO, ver_micro, [Micro version number])
 AC_DEFINE(PACKAGE_VERSION_GIT, "ver_git", [internal vcs version info])
 AC_DEFINE(PACKAGE_VERSION_DATE, "ver_date", [internal built date])
-AC_DEFINE(PACKAGE_VERSION_NEUTRINO_REL_CYCLE, neutrino_rel_cycle, [Neutrino release cycle])
 
 TUXBOX_APPS
 TUXBOX_APPS_DIRECTORY
diff --git a/src/gui/update.cpp b/src/gui/update.cpp
index e6a1672de..e69f45f7f 100644
--- a/src/gui/update.cpp
+++ b/src/gui/update.cpp
@@ -432,7 +432,7 @@ bool CFlashUpdate::checkVersion4Update()
 
 		if (gotImage)
 		{
-			if ((strncmp(RELEASE_CYCLE, versionInfo->getReleaseCycle(), 2) != 0) &&
+			if ((strncmp(PACKAGE_RELEASE_CYCLE, versionInfo->getReleaseCycle(), 2) != 0) &&
 			    (ShowMsg(LOCALE_MESSAGEBOX_INFO, LOCALE_FLASHUPDATE_WRONGBASE, CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbNo, NEUTRINO_ICON_UPDATE) != CMsgBox::mbrYes))
 			{
 				delete versionInfo;
diff --git a/src/system/flashtool.cpp b/src/system/flashtool.cpp
index 12ccbb1ff..f9ef08704 100644
--- a/src/system/flashtool.cpp
+++ b/src/system/flashtool.cpp
@@ -463,7 +463,7 @@ CFlashVersionInfo::CFlashVersionInfo(const std::string & _versionString)
 	snapshot = versionString[0];
 
 	// recover release cycle version
-	// will be compared with RELEASE_CYCLE, which is defined in configure.ac as "x.0"
+	// will be compared with PACKAGE_RELEASE_CYCLE, which is defined in configure.ac as "x.0"
 	releaseCycle[0] = versionString[1];
 	releaseCycle[1] = '.';
 	releaseCycle[2] = '0';