summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.com>2009-11-27 14:45:39 +0100
committerPascal Terjan <pterjan@linuxfr.org>2009-11-27 17:43:43 +0100
commit84d17f73a92fe49eb2f79ae7d3b0e521f852e06e (patch)
tree1b12316b938bdcc7bfde835ef1703d43604a05b0
parent413256f9bc4346f12ee4f97ed73c3ee9fc6e830a (diff)
downloadgnome-desktop-84d17f73a92fe49eb2f79ae7d3b0e521f852e06e.tar.gz
Avoid duplicating version number in configure.in
2.28.1 was released with GNOME_MINOR set to 0 so gnome-about displays 2.28.0 instead of 2.28.1 To avoid this issue this patch only defines the values once Signed-off-by: Pascal Terjan <pterjan@mandriva.com>
-rw-r--r--configure.in18
1 files changed, 14 insertions, 4 deletions
diff --git a/configure.in b/configure.in
index 50789374..4f6c99e1 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,14 @@
-AC_INIT([gnome-desktop], [2.29.3],
+m4_define(gnome_platform, 2)
+m4_define(gnome_minor, 29)
+m4_define(gnome_micro, 3)
+dnl gnome_sub is an optional sub-version which will not be advertised to the user
+dnl It allows to release a 2.30.1.1 which is just a better 2.30.1
+dnl Leave empty if not needed
+m4_define(gnome_sub, )
+
+m4_define(gnome_version, [gnome_platform.gnome_minor.gnome_micro]m4_ifval(gnome_sub, .gnome_sub)),
+
+AC_INIT([gnome-desktop], gnome_version,
[http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-desktop])
AC_CONFIG_SRCDIR([libgnome-desktop])
@@ -34,9 +44,9 @@ AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
PKG_PROG_PKG_CONFIG
-GNOME_PLATFORM=2
-GNOME_MINOR=29
-GNOME_MICRO=2
+GNOME_PLATFORM=gnome_platform
+GNOME_MINOR=gnome_minor
+GNOME_MICRO=gnome_micro
GNOME_DISTRIBUTOR="GNOME.Org"
GNOME_DATE=`date +"%Y-%m-%d"`