diff --git a/configure.ac b/configure.ac index 5ef610d28..be092c06e 100644 --- a/configure.ac +++ b/configure.ac @@ -8,18 +8,16 @@ define(ver_micro, m4_esyscmd([ GITREV=$(git rev-list $GITTAG..HEAD --count); printf "$GITREV" ])) -define(neutrino_rel_cycle, ver_major.ver_minor) +define(rel_cycle, "ver_major.0") AC_INIT(NI-Neutrino, ver_major.ver_minor.ver_micro) AM_INIT_AUTOMAKE([nostdinc foreign]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) -AC_DEFINE(RELEASE_CYCLE, "ver_major.0", [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_NEUTRINO_REL_CYCLE, neutrino_rel_cycle, [Neutrino release cycle]) +AC_DEFINE(PACKAGE_RELEASE_CYCLE, rel_cycle, [Release cycle information; used in update code; only relevant for flash image releases ]) TUXBOX_APPS TUXBOX_APPS_DIRECTORY diff --git a/src/gui/update.cpp b/src/gui/update.cpp index 19847aec2..671a2d713 100644 --- a/src/gui/update.cpp +++ b/src/gui/update.cpp @@ -418,7 +418,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 641ac6235..e913930e8 100644 --- a/src/system/flashtool.cpp +++ b/src/system/flashtool.cpp @@ -481,7 +481,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';