X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=configure.ac;h=1dffbe0f304133bdd1a205da6e3d72c0f2b699d5;hb=bed9d887b5eaf9227b50f90b61449b7821c3dd18;hp=16369b62ec01a2528c8dfcab3a496b3e0b7fad2c;hpb=0c6b8627aa92547d5f224d24a24693f51065f052;p=netdata.git diff --git a/configure.ac b/configure.ac index 16369b62..1dffbe0f 100644 --- a/configure.ac +++ b/configure.ac @@ -7,15 +7,16 @@ define([VERSION_MAJOR], [1]) define([VERSION_MINOR], [5]) define([VERSION_FIX], [1]) define([VERSION_NUMBER], VERSION_MAJOR[.]VERSION_MINOR[.]VERSION_FIX) -define([VERSION_SUFFIX], [_master]) +define([VERSION_SUFFIX], [_rolling]) dnl Set to "1" for a first RPM release of a new version PACKAGE_RPM_RELEASE="0.0.$(echo VERSION_SUFFIX | sed s/^_//)" -define([VERSION_STRING], m4_esyscmd_s(git describe 2> /dev/null)) -m4_ifval(VERSION_STRING, [], [define([VERSION_STRING], VERSION_NUMBER[]VERSION_SUFFIX)]) +# We do not use m4_esyscmd_s to support older autoconf. +define([VERSION_STRING], m4_esyscmd(git describe 2>/dev/null | sed 's/^v//' | tr -d '\n')) +m4_ifval(VERSION_STRING, [], [define([VERSION_STRING], VERSION_NUMBER)]) -AC_INIT([netdata], VERSION_STRING) +AC_INIT([netdata], VERSION_STRING[]VERSION_SUFFIX) AM_MAINTAINER_MODE([disable]) if test x"$USE_MAINTAINER_MODE" = xyes; then