changeset 25310:4210d8eb1708

propagate from branch 'im.pidgin.pidgin' (head 6c480ed0bfda22bc5131c6a0465140f17e3bf40c) to branch 'im.pidgin.pidgin.next.minor' (head 25f9b9338c06fd523c2beaadc9ef46efd003012a)
author Richard Laager <rlaager@wiktel.com>
date Sun, 02 Nov 2008 23:02:42 +0000
parents 5fa132f530f3 (current diff) 260c6f4e6563 (diff)
children 43aeab2bb50e
files
diffstat 2 files changed, 1 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/qq/Makefile.am	Sun Nov 02 22:18:13 2008 +0000
+++ b/libpurple/protocols/qq/Makefile.am	Sun Nov 02 23:02:42 2008 +0000
@@ -53,11 +53,6 @@
 
 libqq_la_LDFLAGS = -module -avoid-version
 
-CURRENT_REVISION=$(shell \
-		 awk 'BEGIN {"grep node .hg_archival.txt" | getline rev; \
-		 rev=substr(rev,7,6); \
-		 print rev}')
-
 if STATIC_QQ
 
 st = -DPURPLE_STATIC_PRPL
@@ -79,5 +74,4 @@
 	-I$(top_builddir)/libpurple \
 	-DQQ_BUDDY_ICON_DIR=\"$(datadir)/pixmaps/purple/buddy_icons/qq\" \
 	$(DEBUG_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	-DOPENQ_VERSION=\"$(CURRENT_REVISION)\"
+	$(GLIB_CFLAGS)
--- a/libpurple/protocols/qq/Makefile.mingw	Sun Nov 02 22:18:13 2008 +0000
+++ b/libpurple/protocols/qq/Makefile.mingw	Sun Nov 02 23:02:42 2008 +0000
@@ -6,10 +6,6 @@
 
 PIDGIN_TREE_TOP := ../../..
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
-CURRENT_REVISION=$(shell \
-		 awk 'BEGIN {"grep node .hg_archival.txt" | getline rev; \
-		 rev=substr(rev,7,6); \
-		 print rev}')
 TARGET = libqq
 TYPE = PLUGIN
 
@@ -19,7 +15,6 @@
 	DLL_INSTALL_DIR =	$(PURPLE_INSTALL_DIR)
 else
 ifeq ($(TYPE),PLUGIN)
-	DEFINES += -DOPENQ_VERSION=\"$(CURRENT_REVISION)\"
 	DLL_INSTALL_DIR =	$(PURPLE_INSTALL_PLUGINS_DIR)
 endif
 endif