# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1194710129 0
# Node ID 008cfc009d0e19210e4092287bb3f910ab13d55f
# Parent  5b1acbab99cf73361694e7d588f5e0761feffe8c
Allow win32 builds to define EXTRAVERSION in local.mak to do the equivalent
to what ./configure --with-extraversion=foo does elsewhere

diff -r 5b1acbab99cf -r 008cfc009d0e config.h.mingw
--- a/config.h.mingw	Sat Nov 10 15:49:57 2007 +0000
+++ b/config.h.mingw	Sat Nov 10 15:55:29 2007 +0000
@@ -378,7 +378,7 @@
 
 /* Version number of package */
 #define VERSION "@VERSION@"
-#define DISPLAY_VERSION "@VERSION@"
+#define DISPLAY_VERSION "@DISPLAY_VERSION@"
 
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */
diff -r 5b1acbab99cf -r 008cfc009d0e libpurple/win32/global.mak
--- a/libpurple/win32/global.mak	Sat Nov 10 15:49:57 2007 +0000
+++ b/libpurple/win32/global.mak	Sat Nov 10 15:55:29 2007 +0000
@@ -71,6 +71,11 @@
   cat $(PIDGIN_TREE_TOP)/VERSION \
 )
 PURPLE_VERSION := $(PIDGIN_VERSION)
+ifdef EXTRAVERSION
+DISPLAY_VERSION := $(PIDGIN_VERSION)-$(EXTRAVERSION)
+else
+DISPLAY_VERSION := $(PIDGIN_VERSION)
+endif
 
 DEFINES += -DHAVE_CONFIG_H
 
diff -r 5b1acbab99cf -r 008cfc009d0e libpurple/win32/targets.mak
--- a/libpurple/win32/targets.mak	Sat Nov 10 15:49:57 2007 +0000
+++ b/libpurple/win32/targets.mak	Sat Nov 10 15:55:29 2007 +0000
@@ -6,7 +6,7 @@
 #
 
 $(PIDGIN_CONFIG_H): $(PIDGIN_CONFIG_H).mingw $(PIDGIN_TREE_TOP)/configure.ac
-	sed -e 's/@VERSION@/$(PIDGIN_VERSION)/' $@.mingw > $@
+	sed -e 's/@VERSION@/$(PIDGIN_VERSION)/; s/@DISPLAY_VERSION@/$(DISPLAY_VERSION)/' $@.mingw > $@
 
 $(PURPLE_PURPLE_H): $(PURPLE_PURPLE_H).in
 	sed -e 's/@PLUGINS_DEFINE@/#define PURPLE_PLUGINS 1/; $@.in > $@