im.pidgin.pidgin: 72a1343e462f5a14ca174142fb419ed344fa6658

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 72a1343e462f5a14ca174142fb419ed344fa6658
Ancestor: 02cdca0429e4b007dd4141fef54f11c8e13a9b91
Author: nosnilmot at pidgin.im
Date: 2007-11-10T15:55:29
Branch: im.pidgin.pidgin

Modified files:
        config.h.mingw libpurple/win32/global.mak
        libpurple/win32/targets.mak

ChangeLog: 

Allow win32 builds to define EXTRAVERSION in local.mak to do the equivalent
to what ./configure --with-extraversion=foo does elsewhere

-------------- next part --------------
============================================================
--- config.h.mingw	3b267d5bc2024e7f5bda432a4a92993c02e9054f
+++ config.h.mingw	f3bfba586b00dbcb07f56374ff2b55d887b88953
@@ -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). */
============================================================
--- libpurple/win32/global.mak	daf08cdcb7d29a33dec71f91aad35ab7fbb84616
+++ libpurple/win32/global.mak	b761e25e1c27f8000cd8d75450729011c48e38d3
@@ -71,6 +71,11 @@ PURPLE_VERSION := $(PIDGIN_VERSION)
   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
 
============================================================
--- libpurple/win32/targets.mak	da0e8859f490cbdef7c9d0b559ee6ad206a6dc33
+++ libpurple/win32/targets.mak	4a29f8d0eead97ef3370bde4e1b9063d906a9203
@@ -6,7 +6,7 @@ $(PIDGIN_CONFIG_H): $(PIDGIN_CONFIG_H).m
 #
 
 $(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 > $@