1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-25 12:10:03 +00:00

finish new tagging setup

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@792 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
Philip Kovacs 2006-11-21 21:47:14 +00:00
parent 3ac219cbd0
commit 967963af12

View File

@ -5,7 +5,9 @@ m4_define([conky_version_major], [1])
m4_define([conky_version_minor], [4]) m4_define([conky_version_minor], [4])
m4_define([conky_version_micro], [5]) 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_tag], [svn])
m4_define([conky_version_revision],[r@REVISION@]) m4_define([conky_version_revision],[r@REVISION@])
@ -13,7 +15,7 @@ m4_define([conky_version],
[conky_version_major().conky_version_minor().conky_version_micro()ifelse( [conky_version_major().conky_version_minor().conky_version_micro()ifelse(
conky_version_tag(), [svn], conky_version_tag(), [svn],
[-conky_version_tag()-conky_version_revision()], [-conky_version_tag()-conky_version_revision()],
[-conky_version_tag()])]) [ifelse(conky_version_tag(), [], [], [-conky_version_tag()])])])
AC_INIT([Conky], [conky_version()], [brenden1@users.sourceforge.net]) AC_INIT([Conky], [conky_version()], [brenden1@users.sourceforge.net])