# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1170219228 0
# Node ID 8fc14c228ca895dea5355879f4b0810a1ef3420e
# Parent  9cf52cd80b9985da871f67416b09b0c47aac365a# Parent  015ad12832164d3ebeb9d68580b7b09b548f6239
merge of '4c75dce7720664ff3945c7a5382e99133a96839d'
     and 'a54eaea6163f0a2320ee05e44da3ca1a50445cc3'

diff -r 9cf52cd80b99 -r 8fc14c228ca8 Makefile.mingw
--- a/Makefile.mingw	Wed Jan 31 04:53:32 2007 +0000
+++ b/Makefile.mingw	Wed Jan 31 04:53:48 2007 +0000
@@ -72,13 +72,13 @@
 	rm -rf $(GAIM_INSTALL_DIR).release
 	cp -R $(GAIM_INSTALL_DIR) $(GAIM_INSTALL_DIR).release
 	find $(GAIM_INSTALL_DIR).release \( -name '*.dll' -o -name '*.exe' \) \
-	 -not \( -false $(NON_GAIM_DLLS_FIND_EXP) \) -exec strip --strip-unneeded {} ';'
+	 -not \( -false $(NON_GAIM_DLLS_FIND_EXP) \) -exec $(STRIP) --strip-unneeded {} ';'
 
 installer: create_release_install_dir
 	$(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DWITH_GTK /DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR).release" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" gaim-installer.nsi
 
 installer_nogtk: create_release_install_dir
-	$(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR).release" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" gaim-installer.nsi
+	$(MAKENSIS) -V3 -DGAIM_VERSION="$(GAIM_VERSION)" -DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" -DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR).release" -DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" gaim-installer.nsi
 
 installer_debug: install
 	$(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR)" /DDEBUG /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" gaim-installer.nsi
diff -r 9cf52cd80b99 -r 8fc14c228ca8 libpurple/plugins/perl/common/Makefile.mingw
--- a/libpurple/plugins/perl/common/Makefile.mingw	Wed Jan 31 04:53:32 2007 +0000
+++ b/libpurple/plugins/perl/common/Makefile.mingw	Wed Jan 31 04:53:48 2007 +0000
@@ -9,7 +9,7 @@
 
 TARGET = Gaim
 AUTOSPLIT = lib/auto/Gaim/autosplit.ix
-EXTUTILS := C:/perl/lib/ExtUtils
+EXTUTILS ?= C:/perl/lib/ExtUtils
 PERL_PLUGIN_TOP := ..
 
 CFLAGS += -Wno-comment
diff -r 9cf52cd80b99 -r 8fc14c228ca8 libpurple/win32/global.mak
--- a/libpurple/win32/global.mak	Wed Jan 31 04:53:32 2007 +0000
+++ b/libpurple/win32/global.mak	Wed Jan 31 04:53:48 2007 +0000
@@ -85,6 +85,7 @@
 MAKENSIS ?= makensis.exe
 PERL ?= /cygdrive/c/perl/bin/perl
 WINDRES ?= windres
+STRIP ?= strip
 
 GAIM_COMMON_RULES := $(GAIM_LIB_TOP)/win32/rules.mak
 GAIM_COMMON_TARGETS := $(GAIM_LIB_TOP)/win32/targets.mak
diff -r 9cf52cd80b99 -r 8fc14c228ca8 pidgin/plugins/perl/common/Makefile.mingw
--- a/pidgin/plugins/perl/common/Makefile.mingw	Wed Jan 31 04:53:32 2007 +0000
+++ b/pidgin/plugins/perl/common/Makefile.mingw	Wed Jan 31 04:53:48 2007 +0000
@@ -8,7 +8,7 @@
 include $(GAIM_TOP)/libpurple/win32/global.mak
 
 TARGET = GtkUI
-EXTUTILS := C:/perl/lib/ExtUtils
+EXTUTILS ?= C:/perl/lib/ExtUtils
 
 CFLAGS += -Wno-comment