From 967963af126a607ce2464b87fc72f042e99e15c6 Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Tue, 21 Nov 2006 21:47:14 +0000 Subject: [PATCH] finish new tagging setup git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@792 7f574dfc-610e-0410-a909-a81674777703 --- configure.ac.in | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 10787d33..f4d26a6e 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -5,15 +5,17 @@ m4_define([conky_version_major], [1]) m4_define([conky_version_minor], [4]) m4_define([conky_version_micro], [5]) -dnl conky_version_tag() macro. change [svn] to [] for releases. +dnl [svn] for versions with svn revision numbers, e.g. 1.4.5-svn-r00790 +dnl [rc1] for release candidates, e.g. 1.4.5-rc1 +dnl [] for releases, e.g. 1.4.5 m4_define([conky_version_tag], [svn]) m4_define([conky_version_revision],[r@REVISION@]) m4_define([conky_version], [conky_version_major().conky_version_minor().conky_version_micro()ifelse( conky_version_tag(), [svn], - [-conky_version_tag()-conky_version_revision()], - [-conky_version_tag()])]) + [-conky_version_tag()-conky_version_revision()], + [ifelse(conky_version_tag(), [], [], [-conky_version_tag()])])]) AC_INIT([Conky], [conky_version()], [brenden1@users.sourceforge.net])