summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Lowell <gary.lowell@inktank.com>2013-07-23 17:00:07 -0700
committerGary Lowell <gary.lowell@inktank.com>2013-07-23 17:00:07 -0700
commit93e486846d390728966d3b7e331beec4c848d045 (patch)
treea3c32eb29eedd3ff625092fdd201a627fbdbf177
parent9a7a0557361bbd67d230c673bfa5867eb40c4c91 (diff)
downloadceph-93e486846d390728966d3b7e331beec4c848d045.tar.gz
configure.ac: Add release candidate flag.wip-build-test
Add an optional release candidate flag that is prepended to the rpm release string. Signed-off-by: Gary Lowell <gary.lowell@inktank.com>
-rw-r--r--configure.ac6
1 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 415da311712..bc9e2350ef9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,10 +8,11 @@ AC_PREREQ(2.59)
# VERSION define is not used by the code. It gets a version string
# from 'git describe'; see src/ceph_ver.[ch]
-AC_INIT([ceph], [0.67-rc1], [ceph-devel@vger.kernel.org])
+AC_INIT([ceph], [0.67], [ceph-devel@vger.kernel.org])
# Create release string. Used with VERSION for RPMs.
RPM_RELEASE=0
+RPM_RELEASE_CANDIDATE="rc1" # blank if not a release candidate
AC_SUBST(RPM_RELEASE)
if test -d ".git" ; then
AC_CHECK_PROG(GIT_CHECK, git, yes)
@@ -19,6 +20,9 @@ if test -d ".git" ; then
RPM_RELEASE=`if expr index $(git describe --always) '-' > /dev/null ; then git describe --always | cut -d- -f2- | tr '-' '.' ; else echo "0"; fi`
fi
fi
+if test -n "$RPM_RELEASE_CANDIDATE" ; then
+ RPM_RELEASE=$RPM_RELEASE_CANDIDATE.$RPM_RELEASE
+fi
AC_MSG_NOTICE([RPM_RELEASE='$RPM_RELEASE'])
AC_CONFIG_MACRO_DIR([m4])