This should get all the Win32 Makefiles in line with

the names Pidgin and Purple.  I tried to separate PIDGIN
and PURPLE values as much as a could to make it easier to
divide them later if that's ever desired.

70 files changed, 1060 insertions, 1055 deletions

diff --git a/Makefile.mingw b/Makefile.mingw
index 842851a316..6016a4ece1 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -2,11 +2,11 @@
 #
 # Author: hermanator12002@yahoo.com
 # Date 9/11/02
-# Description: Top Makefile for win32 (mingw) port of Gaim
+# Description: Top Makefile for win32 (mingw) port of Pidgin and LibPurple
 #
 
-GAIM_TOP := .
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := .
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 # Generate a X.X.X.X version for the installer file versioning header
 # The last digit will be 99 for a final release, 0 for dev or unknown, or the beta number
@@ -58,43 +58,43 @@ EXTERNAL_DLLS_FIND_EXP = $(patsubst %,-o -name %,$(EXTERNAL_DLLS))
 
 .PHONY: all install installer installer_nogtk installer_debug installers clean uninstall create_release_install_dir
 
-all: $(GAIM_CONFIG_H)
-	$(MAKE) -C $(GAIM_LIB_TOP) -f $(GAIM_WIN32_MAKEFILE)
-	$(MAKE) -C $(GAIM_GTK_TOP) -f $(GAIM_WIN32_MAKEFILE)
-	$(MAKE) -C $(GAIM_PO_TOP) -f $(GAIM_WIN32_MAKEFILE)
+all: $(PIDGIN_CONFIG_H)
+	$(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE)
+	$(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE)
+	$(MAKE) -C $(PURPLE_PO_TOP) -f $(MINGW_MAKEFILE)
 
-install: all $(GAIM_INSTALL_DIR)
-	$(MAKE) -C $(GAIM_LIB_TOP) -f $(GAIM_WIN32_MAKEFILE) install
-	$(MAKE) -C $(GAIM_GTK_TOP) -f $(GAIM_WIN32_MAKEFILE) install
-	$(MAKE) -C $(GAIM_PO_TOP) -f $(GAIM_WIN32_MAKEFILE) install
+install: all $(PIDGIN_INSTALL_DIR)
+	$(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE) install
+	$(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) install
+	$(MAKE) -C $(PURPLE_PO_TOP) -f $(MINGW_MAKEFILE) install
 
 create_release_install_dir: install
-	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' \) \
+	rm -rf $(PIDGIN_INSTALL_DIR).release
+	cp -R $(PIDGIN_INSTALL_DIR) $(PIDGIN_INSTALL_DIR).release
+	find $(PIDGIN_INSTALL_DIR).release \( -name '*.dll' -o -name '*.exe' \) \
 	 -not \( -false $(EXTERNAL_DLLS_FIND_EXP) \) -exec $(STRIP) --strip-unneeded {} ';'
 
 installer: create_release_install_dir
-	$(MAKENSIS) /V3 /DPIDGIN_VERSION="$(GAIM_VERSION)" /DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" /DWITH_GTK /DPIDGIN_INSTALL_DIR="$(GAIM_INSTALL_DIR).release" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
+	$(MAKENSIS) /V3 /DPIDGIN_VERSION="$(PIDGIN_VERSION)" /DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" /DWITH_GTK /DPIDGIN_INSTALL_DIR="$(PIDGIN_INSTALL_DIR).release" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
 	mv pidgin/win32/nsis/pidgin*.exe ./
 
 installer_nogtk: create_release_install_dir
-	$(MAKENSIS) /V3 /DPIDGIN_VERSION="$(GAIM_VERSION)" /DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" /DPIDGIN_INSTALL_DIR="$(GAIM_INSTALL_DIR).release" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
+	$(MAKENSIS) /V3 /DPIDGIN_VERSION="$(PIDGIN_VERSION)" /DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" /DPIDGIN_INSTALL_DIR="$(PIDGIN_INSTALL_DIR).release" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
 	mv pidgin/win32/nsis/pidgin*.exe ./
 
 installer_debug: install
-	$(MAKENSIS) /V3 /DPIDGIN_VERSION="$(GAIM_VERSION)" /DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" /DPIDGIN_INSTALL_DIR="$(GAIM_INSTALL_DIR)" /DDEBUG /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
+	$(MAKENSIS) /V3 /DPIDGIN_VERSION="$(PIDGIN_VERSION)" /DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" /DPIDGIN_INSTALL_DIR="$(PIDGIN_INSTALL_DIR)" /DDEBUG /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
 	mv pidgin/win32/nsis/pidgin*.exe ./
 
 installers: installer installer_nogtk installer_debug
 
 clean:
-	$(MAKE) -C $(GAIM_PO_TOP) -f $(GAIM_WIN32_MAKEFILE) clean
-	$(MAKE) -C $(GAIM_GTK_TOP) -f $(GAIM_WIN32_MAKEFILE) clean
-	$(MAKE) -C $(GAIM_LIB_TOP) -f $(GAIM_WIN32_MAKEFILE) clean
-	rm -f $(GAIM_CONFIG_H) VERSION pidgin*.exe
+	$(MAKE) -C $(PURPLE_PO_TOP) -f $(MINGW_MAKEFILE) clean
+	$(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) clean
+	$(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE) clean
+	rm -f $(PIDGIN_CONFIG_H) VERSION pidgin*.exe
 
 uninstall:
-	rm -rf $(GAIM_INSTALL_PERLMOD_DIR) $(GAIM_INSTALL_PLUGINS_DIR) $(GAIM_INSTALL_PO_DIR) $(GAIM_INSTALL_DIR) $(GAIM_INSTALL_DIR).release
+	rm -rf $(PURPLE_INSTALL_PERLMOD_DIR) $(PIDGIN_INSTALL_PLUGINS_DIR) $(PURPLE_INSTALL_PO_DIR) $(PIDGIN_INSTALL_DIR) $(PIDGIN_INSTALL_DIR).release
 
-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
diff --git a/README.mingw b/README.mingw
index ff906646b7..c51e2fb779 100644
--- a/README.mingw
+++ b/README.mingw
@@ -1,6 +1,6 @@
-How to build Gaim using MinGW
-=============================
+How to build Pidgin using MinGW
+===============================
 
 Since these instructions are constantly changing, please refer to:
 
-http://gaim.sourceforge.net/win32/build.php
+http://pidgin.im/win32/build.php
diff --git a/config.h.mingw b/config.h.mingw
index 2ecbb5c2c8..0d3adcc042 100644
--- a/config.h.mingw
+++ b/config.h.mingw
@@ -155,7 +155,7 @@
 /* Define to 1 if you have the `getuid' function. */
 /* #define HAVE_GETUID 1 */
 
-/* Gaim always has GLib, but Linphone can be built without it */
+/* Pidgin always has GLib, but Linphone can be built without it */
 /* #undef HAVE_GLIB */
 
 /* Define if you have GNUTLS */
@@ -638,7 +638,7 @@
 #define HAVE_LIBXML 1
 
 /*
- * Following are added for Win32 version of Gaim
+ * Following are added for Win32 version of Pidgin
  */
 #define HAVE_VSNPRINTF 1
 
diff --git a/libpurple/Makefile.mingw b/libpurple/Makefile.mingw
index 274c5933ba..a972666908 100644
--- a/libpurple/Makefile.mingw
+++ b/libpurple/Makefile.mingw
@@ -1,11 +1,11 @@
 #
 # Makefile.mingw
 #
-# Description: Makefile for win32 (mingw) version of libGaim
+# Description: Makefile for win32 (mingw) version of LibPurple
 #
 
-GAIM_TOP := ..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 TARGET = libpurple
 NEEDED_DLLS = $(LIBXML2_TOP)/bin/libxml2.dll
@@ -14,9 +14,9 @@ NEEDED_DLLS = $(LIBXML2_TOP)/bin/libxml2.dll
 ## INCLUDE PATHS
 ##
 INCLUDE_PATHS =	\
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_TOP) \
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP) \
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
@@ -94,7 +94,7 @@ LIBS =	\
 		-lws2_32 \
 		-lxml2
 
-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)
 
 ##
 ## TARGET DEFINITIONS
@@ -102,22 +102,22 @@ include $(GAIM_COMMON_RULES)
 .PHONY: all install install_shallow clean
 
 all: $(TARGET).dll
-	$(MAKE) -C $(GAIM_PROTOS_TOP) -f $(GAIM_WIN32_MAKEFILE)
-	$(MAKE) -C $(GAIM_LIB_PLUGINS_TOP) -f $(GAIM_WIN32_MAKEFILE)
+	$(MAKE) -C $(PURPLE_PROTOS_TOP) -f $(MINGW_MAKEFILE)
+	$(MAKE) -C $(PURPLE_PLUGINS_TOP) -f $(MINGW_MAKEFILE)
 
-install_shallow: $(GAIM_INSTALL_DIR) $(TARGET).dll
-	cp $(TARGET).dll $(GAIM_INSTALL_DIR)
-	cp $(NEEDED_DLLS) $(GAIM_INSTALL_DIR)
+install_shallow: $(PURPLE_INSTALL_DIR) $(TARGET).dll
+	cp $(TARGET).dll $(PURPLE_INSTALL_DIR)
+	cp $(NEEDED_DLLS) $(PURPLE_INSTALL_DIR)
 
 install: install_shallow all
-	$(MAKE) -C $(GAIM_PROTOS_TOP) -f $(GAIM_WIN32_MAKEFILE) install
-	$(MAKE) -C $(GAIM_LIB_PLUGINS_TOP) -f $(GAIM_WIN32_MAKEFILE) install
+	$(MAKE) -C $(PURPLE_PROTOS_TOP) -f $(MINGW_MAKEFILE) install
+	$(MAKE) -C $(PURPLE_PLUGINS_TOP) -f $(MINGW_MAKEFILE) install
 
-./win32/libpurplerc.rc: ./win32/libpurplerc.rc.in $(GAIM_TOP)/VERSION
-	sed -e 's/@PURPLE_VERSION@/$(GAIM_VERSION)/g' \
+./win32/libpurplerc.rc: ./win32/libpurplerc.rc.in $(PIDGIN_TREE_TOP)/VERSION
+	sed -e 's/@PURPLE_VERSION@/$(PURPLE_VERSION)/g' \
 	    $@.in > $@
 
-$(OBJECTS): $(GAIM_CONFIG_H)
+$(OBJECTS): $(PURPLE_CONFIG_H)
 
 $(TARGET).dll $(TARGET).dll.a: $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--out-implib,$(TARGET).dll.a -o $(TARGET).dll
@@ -128,7 +128,7 @@ $(TARGET).dll $(TARGET).dll.a: $(OBJECTS)
 clean:
 	rm -f $(OBJECTS) $(RC_SRC)
 	rm -f $(TARGET).dll $(TARGET).dll.a
-	$(MAKE) -C $(GAIM_PROTOS_TOP) -f $(GAIM_WIN32_MAKEFILE) clean
-	$(MAKE) -C $(GAIM_LIB_PLUGINS_TOP) -f $(GAIM_WIN32_MAKEFILE) clean
+	$(MAKE) -C $(PURPLE_PROTOS_TOP) -f $(MINGW_MAKEFILE) clean
+	$(MAKE) -C $(PURPLE_PLUGINS_TOP) -f $(MINGW_MAKEFILE) clean
 
-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
diff --git a/libpurple/plugins/Makefile.mingw b/libpurple/plugins/Makefile.mingw
index 3a16237d6b..bab7523808 100644
--- a/libpurple/plugins/Makefile.mingw
+++ b/libpurple/plugins/Makefile.mingw
@@ -1,11 +1,11 @@
 #
 # Makefile.mingw
 #
-# Description: Makefile for win32 (mingw) version of Gaim Plugins 
+# Description: Makefile for win32 (mingw) version of LibPurple Plugins 
 #
 
-GAIM_TOP := ../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 PERL_PLUGIN := ./perl
 TCL_PLUGIN := ./tcl
@@ -21,12 +21,12 @@ INCLUDE_PATHS +=	\
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
-			-I$(GAIM_TOP) \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32
+			-I$(PIDGIN_TREE_TOP) \
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32
 
 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(GAIM_LIB_TOP)
+			-L$(PURPLE_TOP)
 
 ##
 ## LIBRARIES
@@ -44,16 +44,16 @@ LIBS =	\
 ##
 .PHONY: all clean plugins install
 
-all: $(GAIM_LIBGAIM_DLL).a plugins
-	$(MAKE) -C $(PERL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE)
-	$(MAKE) -C $(TCL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE)
-	$(MAKE) -C $(SSL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE)
+all: $(PURPLE_DLL).a plugins
+	$(MAKE) -C $(PERL_PLUGIN) -f $(MINGW_MAKEFILE)
+	$(MAKE) -C $(TCL_PLUGIN) -f $(MINGW_MAKEFILE)
+	$(MAKE) -C $(SSL_PLUGIN) -f $(MINGW_MAKEFILE)
 
-install: all $(GAIM_INSTALL_PLUGINS_DIR)
-	$(MAKE) -C $(PERL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install
-	$(MAKE) -C $(TCL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install
-	$(MAKE) -C $(SSL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install
-	cp *.dll $(GAIM_INSTALL_PLUGINS_DIR)
+install: all $(PURPLE_INSTALL_PLUGINS_DIR)
+	$(MAKE) -C $(PERL_PLUGIN) -f $(MINGW_MAKEFILE) install
+	$(MAKE) -C $(TCL_PLUGIN) -f $(MINGW_MAKEFILE) install
+	$(MAKE) -C $(SSL_PLUGIN) -f $(MINGW_MAKEFILE) install
+	cp *.dll $(PURPLE_INSTALL_PLUGINS_DIR)
 
 .c.dll:
 	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@.o -c $<
@@ -75,8 +75,8 @@ plugins: \
 ##
 clean:
 	rm -f *.o *.dll
-	$(MAKE) -C $(PERL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) clean
-	$(MAKE) -C $(TCL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) clean
-	$(MAKE) -C $(SSL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) clean
+	$(MAKE) -C $(PERL_PLUGIN) -f $(MINGW_MAKEFILE) clean
+	$(MAKE) -C $(TCL_PLUGIN) -f $(MINGW_MAKEFILE) clean
+	$(MAKE) -C $(SSL_PLUGIN) -f $(MINGW_MAKEFILE) clean
 
-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
diff --git a/libpurple/plugins/perl/Makefile.mingw b/libpurple/plugins/perl/Makefile.mingw
index c451d3a2a6..c3a946be45 100755
--- a/libpurple/plugins/perl/Makefile.mingw
+++ b/libpurple/plugins/perl/Makefile.mingw
@@ -4,8 +4,8 @@
 # Description: Makefile for perl plugin loader plugin.
 #
 
-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 TARGET = perl
 
@@ -16,16 +16,16 @@ CFLAGS += -Wno-comment
 ## INCLUDE PATHS
 ##
 INCLUDE_PATHS +=	-I. \
-			-I$(GAIM_TOP) \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP) \
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
 			-I$(PERL_LIB_TOP)/CORE
 
 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(GAIM_LIB_TOP) \
+			-L$(PURPLE_TOP) \
 			-L$(PERL_LIB_TOP)
 
 ##
@@ -49,7 +49,7 @@ LIBS =	\
 			-lpurple \
 			-lperl58
 
-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)
 
 ##
 ## TARGET DEFINITIONS
@@ -57,18 +57,18 @@ include $(GAIM_COMMON_RULES)
 .PHONY: all install clean
 
 all: $(TARGET).dll
-	$(MAKE) -C ./common -f $(GAIM_WIN32_MAKEFILE)
+	$(MAKE) -C ./common -f $(MINGW_MAKEFILE)
 
-install: all $(GAIM_INSTALL_PLUGINS_DIR)
-	cp $(TARGET).dll $(GAIM_INSTALL_PLUGINS_DIR)
-	$(MAKE) -C ./common -f $(GAIM_WIN32_MAKEFILE) install
+install: all $(PURPLE_INSTALL_PLUGINS_DIR)
+	cp $(TARGET).dll $(PURPLE_INSTALL_PLUGINS_DIR)
+	$(MAKE) -C ./common -f $(MINGW_MAKEFILE) install
 
-$(OBJECTS): $(GAIM_CONFIG_H)
+$(OBJECTS): $(PURPLE_CONFIG_H)
 
 ##
 ## BUILD DLL
 ##
-$(TARGET).dll $(TARGET).dll.a: $(GAIM_LIBGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll $(TARGET).dll.a: $(PURPLE_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS)  -Wl,--export-all-symbols -Wl,--out-implib,$(TARGET).dll.a -o $(TARGET).dll
 
 ##
@@ -77,6 +77,6 @@ $(TARGET).dll $(TARGET).dll.a: $(GAIM_LIBGAIM_DLL).a $(OBJECTS)
 clean:
 	rm -rf $(OBJECTS)
 	rm -rf $(TARGET).dll $(TARGET).dll.a
-	$(MAKE) -C ./common -f $(GAIM_WIN32_MAKEFILE) clean
+	$(MAKE) -C ./common -f $(MINGW_MAKEFILE) clean
 
-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
diff --git a/libpurple/plugins/perl/common/Makefile.mingw b/libpurple/plugins/perl/common/Makefile.mingw
index fbc7a1a622..cfd9787d95 100644
--- a/libpurple/plugins/perl/common/Makefile.mingw
+++ b/libpurple/plugins/perl/common/Makefile.mingw
@@ -4,8 +4,8 @@
 # Description: Makefile for Purple perl module.
 #
 
-GAIM_TOP := ../../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 TARGET = Purple
 AUTOSPLIT = lib/auto/Purple/autosplit.ix
@@ -18,8 +18,8 @@ CFLAGS += -Wno-comment -Wno-unused
 ## INCLUDE PATHS
 ##
 INCLUDE_PATHS =		-I. \
-			-I$(GAIM_TOP) \
-			-I$(GAIM_LIB_TOP) \
+			-I$(PIDGIN_TREE_TOP) \
+			-I$(PURPLE_TOP) \
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
@@ -27,7 +27,7 @@ INCLUDE_PATHS =		-I. \
 
 LIB_PATHS = 		-L$(PERL_LIB_TOP) \
 			-L$(PERL_PLUGIN_TOP) \
-			-L$(GAIM_LIB_TOP) \
+			-L$(PURPLE_TOP) \
 			-L$(GTK_TOP)/lib
 
 ##
@@ -80,7 +80,7 @@ LIBS =			-lperl58 \
 			-lpurple \
 			-lglib-2.0
 
-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)
 
 %.inc:
 	cp fallback/$@ ./
@@ -93,18 +93,18 @@ include $(GAIM_COMMON_RULES)
 all: $(TARGET).dll $(AUTOSPLIT)
 
 install: all
-	rm -rf $(GAIM_INSTALL_PERLMOD_DIR)
-	cp -R lib $(GAIM_INSTALL_PERLMOD_DIR)
-	cp $(TARGET).dll $(GAIM_INSTALL_PERLMOD_DIR)
+	rm -rf $(PURPLE_INSTALL_PERLMOD_DIR)
+	cp -R lib $(PURPLE_INSTALL_PERLMOD_DIR)
+	cp $(TARGET).dll $(PURPLE_INSTALL_PERLMOD_DIR)
 
-$(C_FILES): $(GAIM_CONFIG_H)
+$(C_FILES): $(PURPLE_CONFIG_H)
 
 $(AUTOSPLIT):
 	mkdir -p ./lib/auto
 	cp Purple.pm ./lib
 	$(PERL) -MAutoSplit -e 'autosplit("lib/Purple.pm")'
 
-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(GAIM_LIBGAIM_PERL_DLL).a $(FALLBACKS) $(OBJECTS)
+$(TARGET).dll: $(PURPLE_DLL).a $(PURPLE_PERL_DLL).a $(FALLBACKS) $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) -o $(TARGET).dll
 
 ##
@@ -114,4 +114,4 @@ clean:
 	rm -rf $(TARGET).dll $(FALLBACKS) lib
 	rm -f *.o $(C_FILES)
 
-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
diff --git a/libpurple/plugins/ssl/Makefile.mingw b/libpurple/plugins/ssl/Makefile.mingw
index 5736946eb7..75d10af857 100644
--- a/libpurple/plugins/ssl/Makefile.mingw
+++ b/libpurple/plugins/ssl/Makefile.mingw
@@ -4,8 +4,8 @@
 # Description: Makefile for ssl plugin.
 #
 
-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 ##
 ## VARIABLE DEFINITIONS
@@ -30,14 +30,14 @@ INCLUDE_PATHS +=	-I. \
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_TOP) \
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP) \
 			-I$(NSS_TOP)/include \
 			-I$(NSPR_TOP)/include
 
 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(GAIM_LIB_TOP) \
+			-L$(PURPLE_TOP) \
 			-L$(NSS_TOP)/lib \
 			-L$(NSPR_TOP)/lib
 
@@ -61,7 +61,7 @@ LIBS =	\
 			-lnspr4 \
 			-lssl3
 
-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)
 
 ##
 ## TARGET DEFINITIONS
@@ -70,20 +70,20 @@ include $(GAIM_COMMON_RULES)
 
 all: $(TARGET).dll $(TARGET_NSS).dll
 
-install: all $(GAIM_INSTALL_PLUGINS_DIR) $(GAIM_INSTALL_DIR)
-	cp $(TARGET).dll $(GAIM_INSTALL_PLUGINS_DIR)
-	cp $(TARGET_NSS).dll $(GAIM_INSTALL_PLUGINS_DIR)
-	cp $(NEEDED_DLLS) $(GAIM_INSTALL_DIR)
+install: all $(PURPLE_INSTALL_PLUGINS_DIR) $(PURPLE_INSTALL_DIR)
+	cp $(TARGET).dll $(PURPLE_INSTALL_PLUGINS_DIR)
+	cp $(TARGET_NSS).dll $(PURPLE_INSTALL_PLUGINS_DIR)
+	cp $(NEEDED_DLLS) $(PURPLE_INSTALL_DIR)
 
-$(OBJECTS) $(OBJECTS_NSS): $(GAIM_CONFIG_H)
+$(OBJECTS) $(OBJECTS_NSS): $(PURPLE_CONFIG_H)
 
 ##
 ## BUILD DLL
 ##
-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll
 
-$(TARGET_NSS).dll: $(GAIM_LIBGAIM_DLL) $(OBJECTS_NSS)
+$(TARGET_NSS).dll: $(PURPLE_DLL) $(OBJECTS_NSS)
 	$(CC) -shared $(OBJECTS_NSS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET_NSS).dll
 
 ##
@@ -92,4 +92,4 @@ $(TARGET_NSS).dll: $(GAIM_LIBGAIM_DLL) $(OBJECTS_NSS)
 clean:
 	rm -f $(OBJECTS) $(OBJECTS_NSS) $(TARGET).dll $(TARGET_NSS).dll
 
-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
diff --git a/libpurple/plugins/tcl/Makefile.mingw b/libpurple/plugins/tcl/Makefile.mingw
index a3fa1cfe5d..6ea97372c2 100644
--- a/libpurple/plugins/tcl/Makefile.mingw
+++ b/libpurple/plugins/tcl/Makefile.mingw
@@ -4,8 +4,8 @@
 # Description: Makefile for tcl plugin loader plugin.
 #
 
-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 TARGET = tcl
 TCL_INC_DIR := $(TCL_LIB_TOP)/include
@@ -15,16 +15,16 @@ DEFINES += -DHAVE_TK -DUSE_TCL_STUBS -DUSE_TK_STUBS
 ## INCLUDE PATHS
 ##
 INCLUDE_PATHS +=	-I. \
-			-I$(GAIM_TOP) \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP) \
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
 			-I$(TCL_INC_DIR)
 
 LIB_PATHS +=		-L$(GTK_TOP)/lib \
-			-L$(GAIM_LIB_TOP) \
+			-L$(PURPLE_TOP) \
 			-L$(TCL_LIB_TOP)
 
 ##
@@ -50,7 +50,7 @@ LIBS =	\
 			-ltclstub84 \
 			-ltkstub84
 
-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)
 
 ##
 ## TARGET DEFINITIONS
@@ -59,12 +59,12 @@ include $(GAIM_COMMON_RULES)
 
 all: $(TARGET).dll
 
-install: all $(GAIM_INSTALL_PLUGINS_DIR)
-	cp $(TARGET).dll $(GAIM_INSTALL_PLUGINS_DIR)
+install: all $(PURPLE_INSTALL_PLUGINS_DIR)
+	cp $(TARGET).dll $(PURPLE_INSTALL_PLUGINS_DIR)
 
-$(OBJECTS): $(GAIM_CONFIG_H)
+$(OBJECTS): $(PURPLE_CONFIG_H)
 
-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll
 
 ##
@@ -74,4 +74,4 @@ clean:
 	rm -rf $(OBJECTS)
 	rm -rf $(TARGET).dll
 
-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
diff --git a/libpurple/protocols/Makefile.mingw b/libpurple/protocols/Makefile.mingw
index 42140ec881..b1ac8cd549 100644
--- a/libpurple/protocols/Makefile.mingw
+++ b/libpurple/protocols/Makefile.mingw
@@ -2,11 +2,11 @@
 #
 # Author: hermanator12002@yahoo.com
 # Date 9/11/02
-# Description: Top Makefile for win32 (mingw) port of Gaim
+# Description: Protocols Makefile for win32 (mingw) port of LibPurple
 #
 
-GAIM_TOP := ../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 SUBDIRS = gg irc jabber msn novell oscar qq sametime silc simple yahoo
 
@@ -14,16 +14,16 @@ SUBDIRS = gg irc jabber msn novell oscar qq sametime silc simple yahoo
 
 all:
 	for subdir in $(SUBDIRS); do \
-		$(MAKE) -C $$subdir -f $(GAIM_WIN32_MAKEFILE) || exit 1; \
+		$(MAKE) -C $$subdir -f $(MINGW_MAKEFILE) || exit 1; \
 	done;
 
 install: all
 	for subdir in $(SUBDIRS); do \
-		$(MAKE) -C $$subdir -f $(GAIM_WIN32_MAKEFILE) install || exit 1; \
+		$(MAKE) -C $$subdir -f $(MINGW_MAKEFILE) install || exit 1; \
 	done;
 
 clean:
 	for subdir in $(SUBDIRS); do \
-		$(MAKE) -C $$subdir -f $(GAIM_WIN32_MAKEFILE) clean || exit 1; \
+		$(MAKE) -C $$subdir -f $(MINGW_MAKEFILE) clean || exit 1; \
 	done;
 
diff --git a/libpurple/protocols/bonjour/Makefile.mingw b/libpurple/protocols/bonjour/Makefile.mingw
index 0968359293..d673cf1f91 100644
--- a/libpurple/protocols/bonjour/Makefile.mingw
+++ b/libpurple/protocols/bonjour/Makefile.mingw
@@ -4,8 +4,8 @@
 # Description: Makefile for win32 (mingw) version of libbonjour
 #
 
-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 TARGET = libbonjour
 NEEDED_DLLS = $(HOWL_TOP)/bin/libhowl-1.dll
@@ -14,10 +14,10 @@ TYPE = PLUGIN
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
   DEFINES += -DSTATIC
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_DIR)
 else
 ifeq ($(TYPE),PLUGIN)
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_PLUGINS_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_PLUGINS_DIR)
 endif
 endif
 
@@ -29,13 +29,13 @@ INCLUDE_PATHS +=	-I$(BONJOUR_ROOT) \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
 			-I$(HOWL_TOP)/include \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_TOP)
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP)
 
 LIB_PATHS =		-L$(GTK_TOP)/lib \
 			-L$(HOWL_TOP)/lib \
-			-L$(GAIM_LIB_TOP)
+			-L$(PURPLE_TOP)
 
 ##
 ##  SOURCES, OBJECTS
@@ -57,7 +57,7 @@ LIBS =	\
 			-lhowl \
 			-lpurple
 
-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)
 
 ##
 ## TARGET DEFINITIONS
@@ -68,11 +68,11 @@ all: $(TARGET).dll
 
 install: all $(DLL_INSTALL_DIR)
 	cp $(TARGET).dll $(DLL_INSTALL_DIR)
-	cp $(NEEDED_DLLS) $(GAIM_INSTALL_DIR)
+	cp $(NEEDED_DLLS) $(PURPLE_INSTALL_DIR)
 
-$(OBJECTS): $(GAIM_CONFIG_H)
+$(OBJECTS): $(PURPLE_CONFIG_H)
 
-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll
 
 ##
@@ -83,4 +83,4 @@ clean:
 	rm -f $(OBJECTS)
 	rm -f $(TARGET).dll
 
-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
diff --git a/libpurple/protocols/gg/Makefile.mingw b/libpurple/protocols/gg/Makefile.mingw
index 5a48b0e48b..4d44e7635e 100644
--- a/libpurple/protocols/gg/Makefile.mingw
+++ b/libpurple/protocols/gg/Makefile.mingw
@@ -4,8 +4,8 @@
 # Description: Makefile for win32 (mingw) version of libgg
 #
 
-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 TARGET = libgg
 CFLAGS += -include win32dep.h
@@ -14,10 +14,10 @@ TYPE = PLUGIN
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
   DEFINES += -DSTATIC
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_DIR)
 else
 ifeq ($(TYPE),PLUGIN)
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_PLUGINS_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_PLUGINS_DIR)
 endif
 endif
 
@@ -29,12 +29,12 @@ INCLUDE_PATHS +=	-I. \
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_TOP)
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP)
 
 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(GAIM_LIB_TOP) \
+			-L$(PURPLE_TOP) \
 
 ##
 ##  SOURCES, OBJECTS
@@ -64,7 +64,7 @@ LIBS =	\
 			-lpurple \
 			-lws2_32
 
-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)
 
 ##
 ## TARGET DEFINITIONS
@@ -76,9 +76,9 @@ all: $(TARGET).dll
 install: all $(DLL_INSTALL_DIR)
 	cp $(TARGET).dll $(DLL_INSTALL_DIR)
 
-$(OBJECTS): $(GAIM_CONFIG_H)
+$(OBJECTS): $(PURPLE_CONFIG_H)
 
-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll
 
 ##
@@ -88,4 +88,4 @@ clean:
 	rm -f $(OBJECTS)
 	rm -f $(TARGET).dll
 
-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
diff --git a/libpurple/protocols/irc/Makefile.mingw b/libpurple/protocols/irc/Makefile.mingw
index 180ba59a28..e6561136e5 100644
--- a/libpurple/protocols/irc/Makefile.mingw
+++ b/libpurple/protocols/irc/Makefile.mingw
@@ -4,8 +4,8 @@
 # Description: Makefile for win32 (mingw) version of libirc
 #
 
-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 TARGET = libirc
 TYPE = PLUGIN
@@ -13,10 +13,10 @@ TYPE = PLUGIN
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
   DEFINES += -DSTATIC
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_DIR)
 else
 ifeq ($(TYPE),PLUGIN)
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_PLUGINS_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_PLUGINS_DIR)
 endif
 endif
 
@@ -27,12 +27,12 @@ INCLUDE_PATHS +=	-I. \
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_TOP)
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP)
 
 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(GAIM_LIB_TOP)
+			-L$(PURPLE_TOP)
 
 ##
 ##  SOURCES, OBJECTS
@@ -54,7 +54,7 @@ LIBS =	\
 			-lintl \
 			-lpurple
 
-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)
 
 ##
 ## TARGET DEFINITIONS
@@ -66,12 +66,12 @@ all: $(TARGET).dll
 install: all $(DLL_INSTALL_DIR)
 	cp $(TARGET).dll $(DLL_INSTALL_DIR)
 
-$(OBJECTS): $(GAIM_CONFIG_H)
+$(OBJECTS): $(PURPLE_CONFIG_H)
 
 ##
 ## BUILD DLL
 ##
-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll
 
 ##
@@ -82,4 +82,4 @@ clean:
 	rm -f $(OBJECTS)
 	rm -f $(TARGET).dll
 
-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
diff --git a/libpurple/protocols/jabber/Makefile.mingw b/libpurple/protocols/jabber/Makefile.mingw
index c8fbf52e27..2e410f374d 100644
--- a/libpurple/protocols/jabber/Makefile.mingw
+++ b/libpurple/protocols/jabber/Makefile.mingw
@@ -4,8 +4,8 @@
 # Description: Makefile for win32 (mingw) version of libjabber
 #
 
-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 TARGET = libjabber
 TYPE = PLUGIN
@@ -13,10 +13,10 @@ TYPE = PLUGIN
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
   DEFINES += -DSTATIC
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_DIR)
 else
 ifeq ($(TYPE),PLUGIN)
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_PLUGINS_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_PLUGINS_DIR)
 endif
 endif
 
@@ -29,13 +29,13 @@ INCLUDE_PATHS +=	-I. \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
 			-I$(LIBXML2_TOP)/include \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_TOP)
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP)
 
 LIB_PATHS =		-L$(GTK_TOP)/lib \
 			-L$(LIBXML2_TOP)/lib \
-			-L$(GAIM_LIB_TOP)
+			-L$(PURPLE_TOP)
 
 ##
 ##  SOURCES, OBJECTS
@@ -69,7 +69,7 @@ LIBS = \
 			-lintl \
 			-lpurple
 
-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)
 
 ##
 ## TARGET DEFINITIONS
@@ -81,9 +81,9 @@ all: $(TARGET).dll
 install: all $(DLL_INSTALL_DIR)
 	cp $(TARGET).dll $(DLL_INSTALL_DIR)
 
-$(OBJECTS): $(GAIM_CONFIG_H)
+$(OBJECTS): $(PURPLE_CONFIG_H)
 
-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll
 
 ##
@@ -93,4 +93,4 @@ clean:
 	rm -f $(OBJECTS)
 	rm -f $(TARGET).dll
 
-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
diff --git a/libpurple/protocols/msn/Makefile.mingw b/libpurple/protocols/msn/Makefile.mingw
index dcf47bee50..b6e41b9a41 100644
--- a/libpurple/protocols/msn/Makefile.mingw
+++ b/libpurple/protocols/msn/Makefile.mingw
@@ -4,8 +4,8 @@
 # Description: Makefile for win32 (mingw) version of libmsn
 #
 
-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 TARGET = libmsn
 TYPE = PLUGIN
@@ -13,10 +13,10 @@ TYPE = PLUGIN
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
   DEFINES += -DSTATIC
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_DIR)
 else
 ifeq ($(TYPE),PLUGIN)
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_PLUGINS_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_PLUGINS_DIR)
 endif
 endif
 
@@ -27,12 +27,12 @@ INCLUDE_PATHS +=	-I. \
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_TOP)
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP)
 
 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(GAIM_LIB_TOP)
+			-L$(PURPLE_TOP)
 
 ##
 ##  SOURCES, OBJECTS
@@ -78,7 +78,7 @@ LIBS =	\
 			-lws2_32 \
 			-lpurple
 
-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)
 
 ##
 ## TARGET DEFINITIONS
@@ -90,9 +90,9 @@ all: $(TARGET).dll
 install: all $(DLL_INSTALL_DIR)
 	cp $(TARGET).dll $(DLL_INSTALL_DIR)
 
-$(OBJECTS): $(GAIM_CONFIG_H)
+$(OBJECTS): $(PURPLE_CONFIG_H)
 
-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll
 
 ##
@@ -102,4 +102,4 @@ clean:
 	rm -f $(OBJECTS)
 	rm -f $(TARGET).dll
 
-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
diff --git a/libpurple/protocols/novell/Makefile.mingw b/libpurple/protocols/novell/Makefile.mingw
index e1ecd118d8..719aa9075e 100644
--- a/libpurple/protocols/novell/Makefile.mingw
+++ b/libpurple/protocols/novell/Makefile.mingw
@@ -4,8 +4,8 @@
 # Description: Makefile for win32 (mingw) version of libnovell
 #
 
-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 TARGET = libnovell
 TYPE = PLUGIN
@@ -13,10 +13,10 @@ TYPE = PLUGIN
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
   DEFINES += -DSTATIC
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_DIR)
 else
 ifeq ($(TYPE),PLUGIN)
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_PLUGINS_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_PLUGINS_DIR)
 endif
 endif
 
@@ -27,12 +27,12 @@ INCLUDE_PATHS +=	-I. \
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_TOP)
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP)
 
 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(GAIM_LIB_TOP)
+			-L$(PURPLE_TOP)
 
 ##
 ##  SOURCES, OBJECTS
@@ -61,7 +61,7 @@ LIBS =	\
 			-lintl \
 			-lpurple
 
-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)
 
 ##
 ## TARGET DEFINITIONS
@@ -73,9 +73,9 @@ all: $(TARGET).dll
 install: all $(DLL_INSTALL_DIR)
 	cp $(TARGET).dll $(DLL_INSTALL_DIR)
 
-$(OBJECTS): $(GAIM_CONFIG_H)
+$(OBJECTS): $(PURPLE_CONFIG_H)
 
-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll
 
 ##
@@ -85,4 +85,4 @@ clean:
 	rm -f $(OBJECTS)
 	rm -f $(TARGET).dll
 
-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
diff --git a/libpurple/protocols/oscar/Makefile.mingw b/libpurple/protocols/oscar/Makefile.mingw
index baaf757508..9fde044989 100644
--- a/libpurple/protocols/oscar/Makefile.mingw
+++ b/libpurple/protocols/oscar/Makefile.mingw
@@ -4,8 +4,8 @@
 # Description: Makefile for win32 (mingw) version of liboscar
 #
 
-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 TARGET = liboscar
 AIM_TARGET = libaim
@@ -15,10 +15,10 @@ TYPE = PLUGIN
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
   DEFINES += -DSTATIC
-  DLL_INSTALL_DIR =		$(GAIM_INSTALL_DIR)
+  DLL_INSTALL_DIR =		$(PURPLE_INSTALL_DIR)
 else
   ifeq ($(TYPE),PLUGIN)
-    DLL_INSTALL_DIR =	$(GAIM_INSTALL_PLUGINS_DIR)
+    DLL_INSTALL_DIR =	$(PURPLE_INSTALL_PLUGINS_DIR)
   endif
 endif
 
@@ -29,12 +29,12 @@ INCLUDE_PATHS +=	-I. \
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_TOP)
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP)
 
 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(GAIM_LIB_TOP) \
+			-L$(PURPLE_TOP) \
 			-L.
 
 ##
@@ -93,7 +93,7 @@ LIBS =	\
 			-lws2_32 \
 			-lpurple
 
-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)
 
 ##
 ## TARGET DEFINITIONS
@@ -104,11 +104,11 @@ all: $(TARGET).dll $(AIM_TARGET).dll $(ICQ_TARGET).dll
 
 install: all $(DLL_INSTALL_DIR)
 	cp $(AIM_TARGET).dll $(ICQ_TARGET).dll $(DLL_INSTALL_DIR)
-	cp $(TARGET).dll $(GAIM_INSTALL_DIR)
+	cp $(TARGET).dll $(PURPLE_INSTALL_DIR)
 
-$(OBJECTS): $(GAIM_CONFIG_H)
+$(OBJECTS): $(PURPLE_CONFIG_H)
 
-$(TARGET).dll.a $(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll.a $(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--out-implib,$(TARGET).dll.a -o $(TARGET).dll
 
 $(AIM_TARGET).dll: $(TARGET).dll.a $(AIM_OBJECTS)
@@ -125,4 +125,4 @@ clean:
 	rm -f $(AIM_OBJECTS) $(AIM_TARGET).dll
 	rm -f $(ICQ_OBJECTS) $(ICQ_TARGET).dll
 
-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
diff --git a/libpurple/protocols/qq/Makefile.mingw b/libpurple/protocols/qq/Makefile.mingw
index 3234a3173f..db540e4aa9 100644
--- a/libpurple/protocols/qq/Makefile.mingw
+++ b/libpurple/protocols/qq/Makefile.mingw
@@ -4,8 +4,8 @@
 # Description: Makefile for win32 (mingw) version of the QQ prpl
 #
 
-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 TARGET = libqq
 TYPE = PLUGIN
@@ -13,10 +13,10 @@ TYPE = PLUGIN
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
 	DEFINES += -DSTATIC
-	DLL_INSTALL_DIR =	$(GAIM_INSTALL_DIR)
+	DLL_INSTALL_DIR =	$(PURPLE_INSTALL_DIR)
 else
 ifeq ($(TYPE),PLUGIN)
-	DLL_INSTALL_DIR =	$(GAIM_INSTALL_PLUGINS_DIR)
+	DLL_INSTALL_DIR =	$(PURPLE_INSTALL_PLUGINS_DIR)
 endif
 endif
 
@@ -27,13 +27,13 @@ INCLUDE_PATHS += \
 	-I$(GTK_TOP)/include \
 	-I$(GTK_TOP)/include/glib-2.0 \
 	-I$(GTK_TOP)/lib/glib-2.0/include \
-	-I$(GAIM_LIB_TOP) \
-	-I$(GAIM_LIB_TOP)/win32 \
-	-I$(GAIM_TOP)
+	-I$(PURPLE_TOP) \
+	-I$(PURPLE_TOP)/win32 \
+	-I$(PIDGIN_TREE_TOP)
 
 LIB_PATHS = \
 	-L$(GTK_TOP)/lib \
-	-L$(GAIM_LIB_TOP)
+	-L$(PURPLE_TOP)
 
 ##
 ##  SOURCES, OBJECTS
@@ -84,7 +84,7 @@ LIBS = \
 	-lintl \
 	-lpurple
 
-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)
 
 ##
 ## TARGET DEFINITIONS
@@ -96,9 +96,9 @@ all: $(TARGET).dll
 install: all $(DLL_INSTALL_DIR)
 	cp $(TARGET).dll $(DLL_INSTALL_DIR)
 
-$(OBJECTS): $(GAIM_CONFIG_H)
+$(OBJECTS): $(PURPLE_CONFIG_H)
 
-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll
 
 ##
@@ -108,4 +108,4 @@ clean:
 	rm -f $(OBJECTS)
 	rm -f $(TARGET).dll
 
-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
diff --git a/libpurple/protocols/sametime/Makefile.mingw b/libpurple/protocols/sametime/Makefile.mingw
index 5c31b6a5a7..c851070aea 100644
--- a/libpurple/protocols/sametime/Makefile.mingw
+++ b/libpurple/protocols/sametime/Makefile.mingw
@@ -4,8 +4,8 @@
 # Description: Makefile for win32 (mingw) version of libsametime
 #
 
-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 TARGET = libsametime
 NEEDED_DLLS = $(MEANWHILE_TOP)/bin/libmeanwhile-1.dll
@@ -14,10 +14,10 @@ TYPE = PLUGIN
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
   DEFINES += -DSTATIC
-  DLL_INSTALL_DIR = 	$(GAIM_INSTALL_DIR)
+  DLL_INSTALL_DIR = 	$(PURPLE_INSTALL_DIR)
 else
   ifeq ($(TYPE),PLUGIN)
-    DLL_INSTALL_DIR = 	$(GAIM_INSTALL_PLUGINS_DIR)
+    DLL_INSTALL_DIR = 	$(PURPLE_INSTALL_PLUGINS_DIR)
   endif
 endif
 
@@ -29,13 +29,13 @@ INCLUDE_PATHS +=	-I. \
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_TOP)
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP)
 
 LIB_PATHS =		-L$(GTK_TOP)/lib \
 			-L$(MEANWHILE_TOP)/lib \
-			-L$(GAIM_LIB_TOP)
+			-L$(PURPLE_TOP)
 
 ##
 ##  SOURCES, OBJECTS
@@ -54,7 +54,7 @@ LIBS =		\
 		-lmeanwhile \
 		-lpurple
 
-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)
 
 ##
 ## TARGET DEFINITIONS
@@ -63,13 +63,13 @@ include $(GAIM_COMMON_RULES)
 
 all: $(TARGET).dll
 
-install: all $(DLL_INSTALL_DIR) $(GAIM_INSTALL_DIR)
+install: all $(DLL_INSTALL_DIR) $(PURPLE_INSTALL_DIR)
 	cp $(TARGET).dll $(DLL_INSTALL_DIR)
-	cp $(NEEDED_DLLS) $(GAIM_INSTALL_DIR)
+	cp $(NEEDED_DLLS) $(PURPLE_INSTALL_DIR)
 
-$(OBJECTS): $(GAIM_CONFIG_H)
+$(OBJECTS): $(PURPLE_CONFIG_H)
 
-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll
 
 ##
@@ -80,4 +80,4 @@ clean:
 	rm -f $(OBJECTS)
 	rm -f $(TARGET).dll
 
-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
diff --git a/libpurple/protocols/silc/Makefile.mingw b/libpurple/protocols/silc/Makefile.mingw
index 31c4cd7ba7..53a67b92ac 100644
--- a/libpurple/protocols/silc/Makefile.mingw
+++ b/libpurple/protocols/silc/Makefile.mingw
@@ -4,8 +4,8 @@
 # Description: Makefile for win32 (mingw) version of libsilc protocol plugin
 #
 
-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 TARGET = libsilc
 NEEDED_DLLS =		$(SILC_TOOLKIT)/lib/silc.dll \
@@ -15,10 +15,10 @@ TYPE = PLUGIN
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
   DEFINES += -DSTATIC
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_DIR)
 else
 ifeq ($(TYPE),PLUGIN)
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_PLUGINS_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_PLUGINS_DIR)
 endif
 endif
 
@@ -29,13 +29,13 @@ INCLUDE_PATHS +=	-I. \
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_TOP) \
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP) \
 			-I$(SILC_TOOLKIT)/include
 
 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(GAIM_LIB_TOP) \
+			-L$(PURPLE_TOP) \
 			-L$(SILC_TOOLKIT)/lib
 
 ##
@@ -63,7 +63,7 @@ LIBS = \
 			-lsilc \
 			-lsilcclient
 
-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)
 
 ##
 ## TARGET DEFINITIONS
@@ -72,13 +72,13 @@ include $(GAIM_COMMON_RULES)
 
 all: $(TARGET).dll
 
-install: all $(DLL_INSTALL_DIR) $(GAIM_INSTALL_DIR)
+install: all $(DLL_INSTALL_DIR) $(PURPLE_INSTALL_DIR)
 	cp $(TARGET).dll $(DLL_INSTALL_DIR)
-	cp $(NEEDED_DLLS) $(GAIM_INSTALL_DIR)
+	cp $(NEEDED_DLLS) $(PURPLE_INSTALL_DIR)
 
-$(OBJECTS): $(GAIM_CONFIG_H)
+$(OBJECTS): $(PURPLE_CONFIG_H)
 
-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--image-base,0x64000000 -o $(TARGET).dll
 
 ##
@@ -88,4 +88,4 @@ clean:
 	rm -f $(OBJECTS)
 	rm -f $(TARGET).dll
 
-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
diff --git a/libpurple/protocols/simple/Makefile.mingw b/libpurple/protocols/simple/Makefile.mingw
index 0eac2a7155..6d5425bd65 100644
--- a/libpurple/protocols/simple/Makefile.mingw
+++ b/libpurple/protocols/simple/Makefile.mingw
@@ -4,8 +4,8 @@
 # Description: Makefile for win32 (mingw) version of libsimple
 #
 
-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 TARGET = libsimple
 TYPE = PLUGIN
@@ -13,10 +13,10 @@ TYPE = PLUGIN
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
   DEFINES += -DSTATIC
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_DIR)
 else
 ifeq ($(TYPE),PLUGIN)
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_PLUGINS_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_PLUGINS_DIR)
 endif
 endif
 
@@ -27,12 +27,12 @@ INCLUDE_PATHS +=	-I. \
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_TOP)
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP)
 
 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(GAIM_LIB_TOP)
+			-L$(PURPLE_TOP)
 
 ##
 ##  SOURCES, OBJECTS
@@ -51,7 +51,7 @@ LIBS =	\
 			-lintl \
 			-lpurple
 
-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)
 
 ##
 ## TARGET DEFINITIONS
@@ -63,9 +63,9 @@ all: $(TARGET).dll
 install: all $(DLL_INSTALL_DIR)
 	cp $(TARGET).dll $(DLL_INSTALL_DIR)
 
-$(OBJECTS): $(GAIM_CONFIG_H)
+$(OBJECTS): $(PURPLE_CONFIG_H)
 
-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll
 
 ##
@@ -75,4 +75,4 @@ clean:
 	rm -f $(OBJECTS)
 	rm -f $(TARGET).dll
 
-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
diff --git a/libpurple/protocols/toc/Makefile.mingw b/libpurple/protocols/toc/Makefile.mingw
index aa1843f99b..10b18f39b2 100644
--- a/libpurple/protocols/toc/Makefile.mingw
+++ b/libpurple/protocols/toc/Makefile.mingw
@@ -4,8 +4,8 @@
 # Description: Makefile for win32 (mingw) version of libtoc
 #
 
-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 TARGET = libtoc
 TYPE = PLUGIN
@@ -13,10 +13,10 @@ TYPE = PLUGIN
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
   DEFINES += -DSTATIC
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_DIR)
 else
 ifeq ($(TYPE),PLUGIN)
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_PLUGINS_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_PLUGINS_DIR)
 endif
 endif
 
@@ -27,12 +27,12 @@ INCLUDE_PATHS +=	-I$(TOC_ROOT) \
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
-			-I$(LIBGAIM_TOP) \
-			-I$(LIBGAIM_TOP)/win32 \
-			-I$(GAIM_TOP)
+			-I$(LIBPIDGIN_TREE_TOP) \
+			-I$(LIBPIDGIN_TREE_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP)
 
 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(LIBGAIM_TOP)
+			-L$(LIBPIDGIN_TREE_TOP)
 
 ##
 ##  SOURCES, OBJECTS
@@ -50,7 +50,7 @@ LIBS =	\
 			-lintl \
 			-lpurple
 
-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)
 
 ##
 ## TARGET DEFINITIONS
@@ -63,9 +63,9 @@ all: $(TARGET).dll
 install: all $(DLL_INSTALL_DIR)
 	cp $(TARGET).dll $(DLL_INSTALL_DIR)
 
-$(OBJECTS): $(GAIM_CONFIG_H)
+$(OBJECTS): $(PURPLE_CONFIG_H)
 
-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll
 
 ##
@@ -75,4 +75,4 @@ clean:
 	rm -f $(OBJECTS)
 	rm -f $(TARGET).dll
 
-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
diff --git a/libpurple/protocols/yahoo/Makefile.mingw b/libpurple/protocols/yahoo/Makefile.mingw
index 262106d1ff..f6a3d9722d 100644
--- a/libpurple/protocols/yahoo/Makefile.mingw
+++ b/libpurple/protocols/yahoo/Makefile.mingw
@@ -4,8 +4,8 @@
 # Description: Makefile for win32 (mingw) version of libyahoo
 #
 
-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 TARGET = libyahoo
 TYPE = PLUGIN
@@ -13,10 +13,10 @@ TYPE = PLUGIN
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
   DEFINES += -DSTATIC
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_DIR)
 else
 ifeq ($(TYPE),PLUGIN)
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_PLUGINS_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_PLUGINS_DIR)
 endif
 endif
 
@@ -27,12 +27,12 @@ INCLUDE_PATHS +=	-I. \
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_TOP)
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP)
 
 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(GAIM_LIB_TOP)
+			-L$(PURPLE_TOP)
 
 ##
 ##  SOURCES, OBJECTS
@@ -61,7 +61,7 @@ LIBS =			\
 			-lintl \
 			-lpurple
 
-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)
 
 ##
 ## TARGET DEFINITIONS
@@ -74,9 +74,9 @@ all: $(TARGET).dll
 install: all $(DLL_INSTALL_DIR)
 	cp $(TARGET).dll $(DLL_INSTALL_DIR)
 
-$(OBJECTS): $(GAIM_CONFIG_H)
+$(OBJECTS): $(PURPLE_CONFIG_H)
 
-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll
 
 ##
@@ -86,4 +86,4 @@ clean:
 	rm -f $(OBJECTS)
 	rm -f $(TARGET).dll
 
-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
diff --git a/libpurple/protocols/zephyr/Makefile.mingw b/libpurple/protocols/zephyr/Makefile.mingw
index 7aa745796c..0a34a297a2 100644
--- a/libpurple/protocols/zephyr/Makefile.mingw
+++ b/libpurple/protocols/zephyr/Makefile.mingw
@@ -4,8 +4,8 @@
 # Description: Makefile for win32 (mingw) version of libzephyr
 #
 
-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 TARGET = libzephyr
 KRB4_TOP := $(WIN32_DEV_TOP)/kfw-2.6.3-final.fixed
@@ -20,10 +20,10 @@ endif
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
   DEFINES += -DSTATIC
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_DIR)
 else
 ifeq ($(TYPE),PLUGIN)
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_PLUGINS_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_PLUGINS_DIR)
 endif
 endif
 
@@ -34,16 +34,16 @@ INCLUDE_PATHS +=	-I$(ZEPHYR_ROOT) \
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_TOP)
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP)
 
 ifeq ($(USE_KRB4), true)
    INCLUDE_PATHS += -I$(KRB4_TOP)/inc/krb4
 endif
 
 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(GAIM_LIB_TOP)
+			-L$(PURPLE_TOP)
 
 ifeq ($(USE_KRB4), true)
   LIB_PATHS+=-L$(KRB4_TOP)/lib/i386
@@ -122,7 +122,7 @@ ifeq ($(USE_KRB4),true)
   LIBS+= -lkrbv4w32
 endif
 
-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)
 
 ##
 ## TARGET DEFINITIONS
@@ -134,9 +134,9 @@ all: $(TARGET).dll
 install: all $(DLL_INSTALL_DIR)
 	cp $(TARGET).dll $(DLL_INSTALL_DIR)
 
-$(OBJECTS): $(GAIM_CONFIG_H)
+$(OBJECTS): $(PURPLE_CONFIG_H)
 
-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--enable-stdcall-fixup -o $(TARGET).dll
 
 ##
@@ -146,4 +146,4 @@ clean:
 	rm -f $(OBJECTS)
 	rm -f $(TARGET).dll
 
-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
diff --git a/libpurple/win32/global.mak b/libpurple/win32/global.mak
index 47afc8ba35..d880abeb27 100644
--- a/libpurple/win32/global.mak
+++ b/libpurple/win32/global.mak
@@ -2,14 +2,14 @@
 # global.mak
 #
 # This file should be included by all Makefile.mingw files for project
-# wide definitions (after correctly defining GAIM_TOP).
+# wide definitions (after correctly defining PIDGIN_TREE_TOP).
 #
 
-#include optional $(GAIM_TOP)/local.mak to allow overriding of any definitions
--include $(GAIM_TOP)/local.mak
+#include optional $(PIDGIN_TREE_TOP)/local.mak to allow overriding of any definitions
+-include $(PIDGIN_TREE_TOP)/local.mak
 
 # Locations of our various dependencies
-WIN32_DEV_TOP ?= $(GAIM_TOP)/../win32-dev
+WIN32_DEV_TOP ?= $(PIDGIN_TREE_TOP)/../win32-dev
 ASPELL_TOP ?= $(WIN32_DEV_TOP)/aspell-dev-0-50-3-3
 GTKSPELL_TOP ?= $(WIN32_DEV_TOP)/gtkspell-2.0.6
 GTK_TOP ?= $(WIN32_DEV_TOP)/gtk_2_0
@@ -24,48 +24,53 @@ SILC_TOOLKIT ?= $(WIN32_DEV_TOP)/silc-toolkit-1.0.2
 TCL_LIB_TOP ?= $(WIN32_DEV_TOP)/tcl-8.4.5
 
 # Where we installing this stuff to?
-GAIM_INSTALL_DIR := $(GAIM_TOP)/win32-install-dir
-GAIM_INSTALL_PERLMOD_DIR := $(GAIM_INSTALL_DIR)/perlmod
-GAIM_INSTALL_PLUGINS_DIR := $(GAIM_INSTALL_DIR)/plugins
-GAIM_INSTALL_PO_DIR := $(GAIM_INSTALL_DIR)/locale
+PIDGIN_INSTALL_DIR := $(PIDGIN_TREE_TOP)/win32-install-dir
+PURPLE_INSTALL_DIR := $(PIDGIN_TREE_TOP)/win32-install-dir
+PIDGIN_INSTALL_PERLMOD_DIR := $(PIDGIN_INSTALL_DIR)/perlmod
+PIDGIN_INSTALL_PLUGINS_DIR := $(PIDGIN_INSTALL_DIR)/plugins
+PURPLE_INSTALL_PERLMOD_DIR := $(PURPLE_INSTALL_DIR)/perlmod
+PURPLE_INSTALL_PLUGINS_DIR := $(PURPLE_INSTALL_DIR)/plugins
+PURPLE_INSTALL_PO_DIR := $(PURPLE_INSTALL_DIR)/locale
 
 # Important (enough) locations in our source code
-GAIM_LIB_TOP := $(GAIM_TOP)/libpurple
-GAIM_LIB_PLUGINS_TOP := $(GAIM_LIB_TOP)/plugins
-GAIM_LIB_PERL_TOP := $(GAIM_LIB_PLUGINS_TOP)/perl
-GAIM_GTK_TOP := $(GAIM_TOP)/pidgin
-GAIM_GTK_IDLETRACK_TOP := $(GAIM_GTK_TOP)/win32/IdleTracker
-GAIM_GTK_PIXMAPS_TOP := $(GAIM_GTK_TOP)/pixmaps
-GAIM_GTK_PLUGINS_TOP := $(GAIM_GTK_TOP)/plugins
-GAIM_GTK_SOUNDS_TOP := $(GAIM_GTK_TOP)/sounds
-GAIM_PO_TOP := $(GAIM_TOP)/po
-GAIM_PROTOS_TOP := $(GAIM_LIB_TOP)/protocols
+PURPLE_TOP := $(PIDGIN_TREE_TOP)/libpurple
+PURPLE_PLUGINS_TOP := $(PURPLE_TOP)/plugins
+PURPLE_PERL_TOP := $(PURPLE_PLUGINS_TOP)/perl
+PIDGIN_TOP := $(PIDGIN_TREE_TOP)/pidgin
+PIDGIN_IDLETRACK_TOP := $(PIDGIN_TOP)/win32/IdleTracker
+PIDGIN_PIXMAPS_TOP := $(PIDGIN_TOP)/pixmaps
+PIDGIN_PLUGINS_TOP := $(PIDGIN_TOP)/plugins
+PIDGIN_SOUNDS_TOP := $(PIDGIN_TOP)/sounds
+PURPLE_PO_TOP := $(PIDGIN_TREE_TOP)/po
+PURPLE_PROTOS_TOP := $(PURPLE_TOP)/protocols
 
 # Locations of important (in-tree) build targets
-GAIM_CONFIG_H := $(GAIM_TOP)/config.h
-GAIM_IDLETRACK_DLL := $(GAIM_GTK_IDLETRACK_TOP)/idletrack.dll
-GAIM_LIBGAIM_DLL := $(GAIM_LIB_TOP)/libpurple.dll
-GAIM_LIBGAIM_PERL_DLL := $(GAIM_LIB_PERL_TOP)/perl.dll
-GAIM_GTKGAIM_DLL := $(GAIM_GTK_TOP)/pidgin.dll
-GAIM_EXE := $(GAIM_GTK_TOP)/pidgin.exe
-GAIM_PORTABLE_EXE := $(GAIM_GTK_TOP)/pidgin-portable.exe
+PIDGIN_CONFIG_H := $(PIDGIN_TREE_TOP)/config.h
+PURPLE_CONFIG_H := $(PIDGIN_TREE_TOP)/config.h
+PIDGIN_IDLETRACK_DLL := $(PIDGIN_IDLETRACK_TOP)/idletrack.dll
+PURPLE_DLL := $(PURPLE_TOP)/libpurple.dll
+PURPLE_PERL_DLL := $(PURPLE_PERL_TOP)/perl.dll
+PIDGIN_DLL := $(PIDGIN_TOP)/pidgin.dll
+PIDGIN_EXE := $(PIDGIN_TOP)/pidgin.exe
+PIDGIN_PORTABLE_EXE := $(PIDGIN_TOP)/pidgin-portable.exe
 
 GCCWARNINGS := -Waggregate-return -Wcast-align -Wdeclaration-after-statement -Werror-implicit-function-declaration -Wextra -Wno-sign-compare -Wno-unused-parameter -Winit-self -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wundef
 
 # parse the version number from the configure.ac file if it is newer
-#AC_INIT([gaim], [2.0.0dev], [gaim-devel@lists.sourceforge.net])
-GAIM_VERSION := $(shell \
-  if [ ! $(GAIM_TOP)/VERSION -nt $(GAIM_TOP)/configure.ac ]; then \
+#AC_INIT([pidgin], [2.0.0dev], [devel@pidgin.im])
+PIDGIN_VERSION := $(shell \
+  if [ ! $(PIDGIN_TREE_TOP)/VERSION -nt $(PIDGIN_TREE_TOP)/configure.ac ]; then \
     awk 'BEGIN {FS="\\] *, *\\["} /^AC_INIT\(.+\)/ {printf("%s",$$2); exit}' \
-      $(GAIM_TOP)/configure.ac > $(GAIM_TOP)/VERSION; \
+      $(PIDGIN_TREE_TOP)/configure.ac > $(PIDGIN_TREE_TOP)/VERSION; \
   fi; \
-  cat $(GAIM_TOP)/VERSION \
+  cat $(PIDGIN_TREE_TOP)/VERSION \
 )
+PURPLE_VERSION := $(PIDGIN_VERSION)
 
-DEFINES += 	-DVERSION=\"$(GAIM_VERSION)\" \
+DEFINES += 	-DVERSION=\"$(PIDGIN_VERSION)\" \
 		-DHAVE_CONFIG_H
 
-# Use -g flag when building debug version of Gaim (including plugins).
+# Use -g flag when building debug version of Pidgin (including plugins).
 # Use -fnative-struct instead of -mms-bitfields when using mingw 1.1
 # (gcc 2.95)
 CFLAGS += -O2 -Wall $(GCCWARNINGS) -pipe -mno-cygwin -mms-bitfields -g
@@ -87,6 +92,6 @@ 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
-GAIM_WIN32_MAKEFILE := Makefile.mingw
+PIDGIN_COMMON_RULES := $(PURPLE_TOP)/win32/rules.mak
+PIDGIN_COMMON_TARGETS := $(PURPLE_TOP)/win32/targets.mak
+MINGW_MAKEFILE := Makefile.mingw
diff --git a/libpurple/win32/rules.mak b/libpurple/win32/rules.mak
index 282ae4b7e1..57723976a4 100644
--- a/libpurple/win32/rules.mak
+++ b/libpurple/win32/rules.mak
@@ -4,7 +4,7 @@
 	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@ -c $<
 
 %.c: %.xs
-	$(PERL) $(EXTUTILS)/xsubpp -typemap $(EXTUTILS)/typemap -typemap $(GAIM_LIB_PERL_TOP)/common/typemap $< > $@
+	$(PERL) $(EXTUTILS)/xsubpp -typemap $(EXTUTILS)/typemap -typemap $(PURPLE_PERL_TOP)/common/typemap $< > $@
 
 %.o: %.rc
-	$(WINDRES) -I$(GAIM_LIB_TOP) -i $< -o $@
+	$(WINDRES) -I$(PURPLE_TOP) -i $< -o $@
diff --git a/libpurple/win32/targets.mak b/libpurple/win32/targets.mak
index 33b5fe6845..91c251da48 100644
--- a/libpurple/win32/targets.mak
+++ b/libpurple/win32/targets.mak
@@ -5,37 +5,37 @@
 # files for better handling of cross directory dependencies
 #
 
-$(GAIM_CONFIG_H): $(GAIM_TOP)/config.h.mingw
-	cp $(GAIM_TOP)/config.h.mingw $(GAIM_CONFIG_H)
+$(PIDGIN_CONFIG_H): $(PIDGIN_TREE_TOP)/config.h.mingw
+	cp $(PIDGIN_TREE_TOP)/config.h.mingw $(PIDGIN_CONFIG_H)
 
-$(GAIM_LIBGAIM_DLL) $(GAIM_LIBGAIM_DLL).a:
-	$(MAKE) -C $(GAIM_LIB_TOP) -f $(GAIM_WIN32_MAKEFILE) libpurple.dll
+$(PURPLE_DLL) $(PURPLE_DLL).a:
+	$(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE) libpurple.dll
 
-$(GAIM_LIBGAIM_PERL_DLL) $(GAIM_LIBGAIM_PERL_DLL).a:
-	$(MAKE) -C $(GAIM_LIB_PERL_TOP) -f $(GAIM_WIN32_MAKEFILE) perl.dll
+$(PURPLE_PERL_DLL) $(PURPLE_PERL_DLL).a:
+	$(MAKE) -C $(PURPLE_PERL_TOP) -f $(MINGW_MAKEFILE) perl.dll
 
-$(GAIM_GTKGAIM_DLL) $(GAIM_GTKGAIM_DLL).a:
-	$(MAKE) -C $(GAIM_GTK_TOP) -f $(GAIM_WIN32_MAKEFILE) pidgin.dll
+$(PIDGIN_DLL) $(PIDGIN_DLL).a:
+	$(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) pidgin.dll
 
-$(GAIM_IDLETRACK_DLL) $(GAIM_IDLETRACK_DLL).a:
-	$(MAKE) -C $(GAIM_GTK_IDLETRACK_TOP) -f $(GAIM_WIN32_MAKEFILE) idletrack.dll
+$(PIDGIN_IDLETRACK_DLL) $(PIDGIN_IDLETRACK_DLL).a:
+	$(MAKE) -C $(PIDGIN_IDLETRACK_TOP) -f $(MINGW_MAKEFILE) idletrack.dll
 
-$(GAIM_EXE):
-	$(MAKE) -C $(GAIM_GTK_TOP) -f $(GAIM_WIN32_MAKEFILE) pidgin.exe
+$(PIDGIN_EXE):
+	$(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) pidgin.exe
 
-$(GAIM_PORTABLE_EXE):
-	$(MAKE) -C $(GAIM_GTK_TOP) -f $(GAIM_WIN32_MAKEFILE) pidgin-portable.exe
+$(PIDGIN_PORTABLE_EXE):
+	$(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) pidgin-portable.exe
 
 # Installation Directories
-$(GAIM_INSTALL_DIR):
-	mkdir -p $(GAIM_INSTALL_DIR)
+$(PIDGIN_INSTALL_DIR):
+	mkdir -p $(PIDGIN_INSTALL_DIR)
 
-$(GAIM_INSTALL_PERLMOD_DIR):
-	mkdir -p $(GAIM_INSTALL_PERLMOD_DIR)
+$(PIDGIN_INSTALL_PERLMOD_DIR):
+	mkdir -p $(PURPLE_INSTALL_PERLMOD_DIR)
 
-$(GAIM_INSTALL_PLUGINS_DIR):
-	mkdir -p $(GAIM_INSTALL_PLUGINS_DIR)
+$(PIDGIN_INSTALL_PLUGINS_DIR):
+	mkdir -p $(PIDGIN_INSTALL_PLUGINS_DIR)
 
-$(GAIM_INSTALL_PO_DIR):
-	mkdir -p $(GAIM_INSTALL_PO_DIR)
+$(PURPLE_INSTALL_PO_DIR):
+	mkdir -p $(PURPLE_INSTALL_PO_DIR)
 
diff --git a/pidgin/Makefile.mingw b/pidgin/Makefile.mingw
index ad934f31be..48a9caf7bd 100644
--- a/pidgin/Makefile.mingw
+++ b/pidgin/Makefile.mingw
@@ -1,11 +1,11 @@
 #
 # Makefile.mingw
 #
-# Description: Makefile for win32 (mingw) version of Gaim
+# Description: Makefile for win32 (mingw) version of Pidgin
 #
 
-GAIM_TOP := ..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 NEEDED_DLLS = $(GTKSPELL_TOP)/gtkspell/libgtkspell.dll
 
@@ -13,7 +13,7 @@ NEEDED_DLLS = $(GTKSPELL_TOP)/gtkspell/libgtkspell.dll
 ## VARIABLE DEFINITIONS
 ##
 EXE_TARGET := pidgin
-GTKGAIM_TARGET := pidgin
+PIDGIN_TARGET := pidgin
 EXE_NAME := $(EXE_TARGET).exe
 
 WINAPP := -mwindows
@@ -23,19 +23,19 @@ LDFLAGS := $(WINAPP)
 ##
 ## INCLUDE PATHS
 ##
-LIBGAIM_INCLUDE_PATHS =	\
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_TOP) \
+PURPLE_INCLUDE_PATHS =	\
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP) \
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include
 
 INCLUDE_PATHS =	\
-			$(LIBGAIM_INCLUDE_PATHS) \
-			-I$(GAIM_GTK_IDLETRACK_TOP) \
-			-I$(GAIM_GTK_TOP) \
-			-I$(GAIM_GTK_TOP)/win32 \
+			$(PURPLE_INCLUDE_PATHS) \
+			-I$(PIDGIN_IDLETRACK_TOP) \
+			-I$(PIDGIN_TOP) \
+			-I$(PIDGIN_TOP)/win32 \
 			-I$(GTK_TOP)/include/gtk-2.0 \
 			-I$(GTK_TOP)/include/pango-1.0 \
 			-I$(GTK_TOP)/include/atk-1.0 \
@@ -44,15 +44,15 @@ INCLUDE_PATHS =	\
 			-I$(ASPELL_TOP)/include
 
 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(GAIM_LIB_TOP) \
-			-L$(GAIM_GTK_TOP) \
-			-L$(GAIM_GTK_IDLETRACK_TOP) \
+			-L$(PURPLE_TOP) \
+			-L$(PIDGIN_TOP) \
+			-L$(PIDGIN_IDLETRACK_TOP) \
 			-L$(ASPELL_TOP)/lib
 
 ##
 ##  SOURCES, OBJECTS
 ##
-GTKGAIM_C_SRC =	\
+PIDGIN_C_SRC =	\
 			gtkaccount.c \
 			gtkblist.c \
 			gtkconn.c \
@@ -95,8 +95,8 @@ GTKGAIM_C_SRC =	\
 			win32/untar.c \
 			win32/wspell.c
 
-GTKGAIM_RC_SRC = win32/pidgin_dll_rc.rc
-GTKGAIM_OBJECTS = $(GTKGAIM_C_SRC:%.c=%.o) $(GTKGAIM_RC_SRC:%.rc=%.o)
+PIDGIN_RC_SRC = win32/pidgin_dll_rc.rc
+PIDGIN_OBJECTS = $(PIDGIN_C_SRC:%.c=%.o) $(PIDGIN_RC_SRC:%.rc=%.o)
 
 EXE_RC_SRC = win32/pidgin_exe_rc.rc
 EXE_C_SRC = win32/winpidgin.c
@@ -105,7 +105,7 @@ EXE_OBJECTS = $(EXE_C_SRC:%.c=%.o) $(EXE_RC_SRC:%.rc=%.o)
 ##
 ## LIBRARIES
 ##
-LIBGAIM_LIBS =	\
+LIBPURPLES =	\
 		-lpurple \
 		-lglib-2.0 \
 		-lgthread-2.0 \
@@ -116,8 +116,8 @@ LIBGAIM_LIBS =	\
 		-lwinmm \
 		-lz
 
-GTKGAIM_LIBS =	\
-		$(LIBGAIM_LIBS) \
+GTKPURPLES =	\
+		$(LIBPURPLES) \
 		-lidletrack \
 		-lgtk-win32-2.0 \
 		-latk-1.0 \
@@ -126,60 +126,60 @@ GTKGAIM_LIBS =	\
 		-lgdk_pixbuf-2.0 \
 		-lgdi32
 
-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)
 
 ##
 ## TARGET DEFINITIONS
 ##
 .PHONY: all install install_shallow clean clean_exe
 
-all: $(EXE_TARGET).exe $(GTKGAIM_TARGET).dll
-	$(MAKE) -C $(GAIM_GTK_PLUGINS_TOP) -f $(GAIM_WIN32_MAKEFILE)
+all: $(EXE_TARGET).exe $(PIDGIN_TARGET).dll
+	$(MAKE) -C $(PIDGIN_PLUGINS_TOP) -f $(MINGW_MAKEFILE)
 
-win32/pidgin_exe_rc.rc: win32/pidgin_exe_rc.rc.in $(GAIM_TOP)/VERSION
-	sed -e 's/@PIDGIN_VERSION@/$(GAIM_VERSION)/g' \
+win32/pidgin_exe_rc.rc: win32/pidgin_exe_rc.rc.in $(PIDGIN_TREE_TOP)/VERSION
+	sed -e 's/@PIDGIN_VERSION@/$(PIDGIN_VERSION)/g' \
 	    -e 's/@ORIGINAL_FILENAME@/$(EXE_NAME)/' \
 	    $@.in > $@
 
-install_shallow: $(GAIM_INSTALL_DIR) $(EXE_TARGET).exe $(GTKGAIM_TARGET).dll
-	cp $(EXE_TARGET).exe $(GTKGAIM_TARGET).dll $(GAIM_INSTALL_DIR)
-	cp $(NEEDED_DLLS) $(GAIM_INSTALL_DIR)
+install_shallow: $(PIDGIN_INSTALL_DIR) $(EXE_TARGET).exe $(PIDGIN_TARGET).dll
+	cp $(EXE_TARGET).exe $(PIDGIN_TARGET).dll $(PIDGIN_INSTALL_DIR)
+	cp $(NEEDED_DLLS) $(PIDGIN_INSTALL_DIR)
 
 install: install_shallow all
-	$(MAKE) -C $(GAIM_GTK_PLUGINS_TOP) -f $(GAIM_WIN32_MAKEFILE) install
-	$(MAKE) -C $(GAIM_GTK_PIXMAPS_TOP) -f $(GAIM_WIN32_MAKEFILE) install
-	$(MAKE) -C $(GAIM_GTK_SOUNDS_TOP) -f $(GAIM_WIN32_MAKEFILE) install
-	$(MAKE) -C $(GAIM_GTK_IDLETRACK_TOP) -f $(GAIM_WIN32_MAKEFILE) install
+	$(MAKE) -C $(PIDGIN_PLUGINS_TOP) -f $(MINGW_MAKEFILE) install
+	$(MAKE) -C $(PIDGIN_PIXMAPS_TOP) -f $(MINGW_MAKEFILE) install
+	$(MAKE) -C $(PIDGIN_SOUNDS_TOP) -f $(MINGW_MAKEFILE) install
+	$(MAKE) -C $(PIDGIN_IDLETRACK_TOP) -f $(MINGW_MAKEFILE) install
 
-win32/pidgin_dll_rc.rc: win32/pidgin_dll_rc.rc.in $(GAIM_TOP)/VERSION
-	sed -e 's/@PIDGIN_VERSION@/$(GAIM_VERSION)/g' \
+win32/pidgin_dll_rc.rc: win32/pidgin_dll_rc.rc.in $(PIDGIN_TREE_TOP)/VERSION
+	sed -e 's/@PIDGIN_VERSION@/$(PIDGIN_VERSION)/g' \
 	    $@.in > $@
 
-$(EXE_OBJECTS) $(GTKGAIM_OBJECTS): $(GAIM_CONFIG_H)
+$(EXE_OBJECTS) $(PIDGIN_OBJECTS): $(PIDGIN_CONFIG_H)
 
-$(GTKGAIM_TARGET).dll $(GTKGAIM_TARGET).dll.a: $(GAIM_LIBGAIM_DLL).a $(GAIM_IDLETRACK_DLL).a $(GTKGAIM_OBJECTS)
-	$(CC) -shared $(GTKGAIM_OBJECTS) $(LIB_PATHS) $(GTKGAIM_LIBS) $(DLL_LD_FLAGS) -Wl,--out-implib,$(GTKGAIM_TARGET).dll.a -o $(GTKGAIM_TARGET).dll
+$(PIDGIN_TARGET).dll $(PIDGIN_TARGET).dll.a: $(PURPLE_DLL).a $(PIDGIN_IDLETRACK_DLL).a $(PIDGIN_OBJECTS)
+	$(CC) -shared $(PIDGIN_OBJECTS) $(LIB_PATHS) $(GTKPURPLES) $(DLL_LD_FLAGS) -Wl,--out-implib,$(PIDGIN_TARGET).dll.a -o $(PIDGIN_TARGET).dll
 
-$(EXE_TARGET).exe: $(GAIM_CONFIG_H) $(GAIM_GTKGAIM_DLL).a $(GAIM_IDLETRACK_DLL).a $(EXE_OBJECTS)
+$(EXE_TARGET).exe: $(PIDGIN_CONFIG_H) $(PIDGIN_DLL).a $(PIDGIN_IDLETRACK_DLL).a $(EXE_OBJECTS)
 	$(CC) $(LDFLAGS) $(EXE_OBJECTS) -o $(EXE_TARGET).exe
 
 $(EXE_TARGET)-portable.exe: DEFINES += -DPORTABLE
 $(EXE_TARGET)-portable.exe: EXE_NAME := $(EXE_TARGET)-portable.exe
-$(EXE_TARGET)-portable.exe: clean_exe $(GAIM_CONFIG_H) $(GAIM_GTKGAIM_DLL).a $(GAIM_IDLETRACK_DLL).a $(EXE_OBJECTS)
+$(EXE_TARGET)-portable.exe: clean_exe $(PIDGIN_CONFIG_H) $(PIDGIN_DLL).a $(PIDGIN_IDLETRACK_DLL).a $(EXE_OBJECTS)
 	$(CC) $(LDFLAGS) $(EXE_OBJECTS) -o $(EXE_TARGET)-portable.exe
-	$(MAKE) -f $(GAIM_WIN32_MAKEFILE) clean_exe
+	$(MAKE) -f $(MINGW_MAKEFILE) clean_exe
 
 ##
 ## CLEAN RULES
 ##
 clean:
-	$(MAKE) -C $(GAIM_GTK_IDLETRACK_TOP) -f $(GAIM_WIN32_MAKEFILE) clean
-	$(MAKE) -C $(GAIM_GTK_PLUGINS_TOP) -f $(GAIM_WIN32_MAKEFILE) clean
-	rm -f $(GTKGAIM_OBJECTS) $(GTKGAIM_RC_SRC) $(EXE_OBJECTS) $(EXE_RC_SRC)
-	rm -f $(GTKGAIM_TARGET).dll $(GTKGAIM_TARGET).dll.a
+	$(MAKE) -C $(PIDGIN_IDLETRACK_TOP) -f $(MINGW_MAKEFILE) clean
+	$(MAKE) -C $(PIDGIN_PLUGINS_TOP) -f $(MINGW_MAKEFILE) clean
+	rm -f $(PIDGIN_OBJECTS) $(PIDGIN_RC_SRC) $(EXE_OBJECTS) $(EXE_RC_SRC)
+	rm -f $(PIDGIN_TARGET).dll $(PIDGIN_TARGET).dll.a
 	rm -f $(EXE_TARGET).exe $(EXE_TARGET)-portable.exe
 
 clean_exe:
 	rm -f $(EXE_OBJECTS) $(EXE_RC_SRC)
 
-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
diff --git a/pidgin/pixmaps/Makefile.mingw b/pidgin/pixmaps/Makefile.mingw
index 2179d17f51..fbfa70ee35 100644
--- a/pidgin/pixmaps/Makefile.mingw
+++ b/pidgin/pixmaps/Makefile.mingw
@@ -1,41 +1,41 @@
-#

-# Makefile.mingw

-#

-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps

-#

-

-GAIM_TOP := ../..

-include $(GAIM_TOP)/libpurple/win32/global.mak

-

-datadir := $(GAIM_INSTALL_DIR)

-include ./Makefile.am

-

-.PHONY: install

-

-install:

-	if test '$(SUBDIRS)'; then \

-	  list='$(SUBDIRS)'; for subdir in $$list; do \

-	    $(MAKE) -C $$subdir -f $(GAIM_WIN32_MAKEFILE) install || exit 1 ;\

-	  done; \

-	fi;

-	if test '$(pidginbuttonpix_DATA)'; then \

-	  mkdir -p $(pidginbuttonpixdir); \

-	  cp $(pidginbuttonpix_DATA) $(pidginbuttonpixdir); \

-	fi;

-	if test '$(pidgindialogpix_DATA)'; then \

-	  mkdir -p $(pidgindialogpixdir); \

-	  cp $(pidgindialogpix_DATA) $(pidgindialogpixdir); \

-	fi;

-	if test '$(pidginiconpix_DATA)'; then \

-	  mkdir -p $(pidginiconpixdir); \

-	  cp $(pidginiconpix_DATA) $(pidginiconpixdir); \

-	fi;

-	if test '$(pidgindistpix_DATA)'; then \

-	  mkdir -p $(pidgindistpixdir); \

-	  cp $(pidgindistpix_DATA) $(pidgindistpixdir); \

-	fi;

-#	if test '$(distpixmap_DATA)'; then \

-#	  mkdir -p $(distpixmapdir); \

-#	  cp $(distpixmap_DATA) $(distpixmapdir); \

-#	fi;

-

+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir := $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(SUBDIRS)'; then \
+	  list='$(SUBDIRS)'; for subdir in $$list; do \
+	    $(MAKE) -C $$subdir -f $(MINGW_MAKEFILE) install || exit 1 ;\
+	  done; \
+	fi;
+	if test '$(pidginbuttonpix_DATA)'; then \
+	  mkdir -p $(pidginbuttonpixdir); \
+	  cp $(pidginbuttonpix_DATA) $(pidginbuttonpixdir); \
+	fi;
+	if test '$(pidgindialogpix_DATA)'; then \
+	  mkdir -p $(pidgindialogpixdir); \
+	  cp $(pidgindialogpix_DATA) $(pidgindialogpixdir); \
+	fi;
+	if test '$(pidginiconpix_DATA)'; then \
+	  mkdir -p $(pidginiconpixdir); \
+	  cp $(pidginiconpix_DATA) $(pidginiconpixdir); \
+	fi;
+	if test '$(pidgindistpix_DATA)'; then \
+	  mkdir -p $(pidgindistpixdir); \
+	  cp $(pidgindistpix_DATA) $(pidgindistpixdir); \
+	fi;
+#	if test '$(distpixmap_DATA)'; then \
+#	  mkdir -p $(distpixmapdir); \
+#	  cp $(distpixmap_DATA) $(distpixmapdir); \
+#	fi;
+
diff --git a/pidgin/pixmaps/animations/16/Makefile.mingw b/pidgin/pixmaps/animations/16/Makefile.mingw
index b1ed4903f0..deddd70051 100644
--- a/pidgin/pixmaps/animations/16/Makefile.mingw
+++ b/pidgin/pixmaps/animations/16/Makefile.mingw
@@ -1,20 +1,20 @@
-#

-# Makefile.mingw

-#

-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps

-#

-

-GAIM_TOP := ../../../..

-include $(GAIM_TOP)/libpurple/win32/global.mak

-

-datadir = $(GAIM_INSTALL_DIR)

-include ./Makefile.am

-

-.PHONY: install

-

-install:

-	if test '$(pidginanimpix_DATA)'; then \

-	  mkdir -p $(pidginanimpixdir); \

-	  cp $(pidginanimpix_DATA) $(pidginanimpixdir); \

-	fi;

-

+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidginanimpix_DATA)'; then \
+	  mkdir -p $(pidginanimpixdir); \
+	  cp $(pidginanimpix_DATA) $(pidginanimpixdir); \
+	fi;
+
diff --git a/pidgin/pixmaps/animations/Makefile.mingw b/pidgin/pixmaps/animations/Makefile.mingw
index 91a9144b4a..c57e696b27 100644
--- a/pidgin/pixmaps/animations/Makefile.mingw
+++ b/pidgin/pixmaps/animations/Makefile.mingw
@@ -1,7 +1,7 @@
 #
 # Makefile.mingw
 #
-# Description: Makefile for win32 (mingw) version of Gaim pixmaps
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
 #
 
 include ./Makefile.am
diff --git a/pidgin/pixmaps/buddy_icons/Makefile.mingw b/pidgin/pixmaps/buddy_icons/Makefile.mingw
index 5e2147f758..d497bd4098 100644
--- a/pidgin/pixmaps/buddy_icons/Makefile.mingw
+++ b/pidgin/pixmaps/buddy_icons/Makefile.mingw
@@ -1,7 +1,7 @@
 #
 # Makefile.mingw
 #
-# Description: Makefile for win32 (mingw) version of Gaim pixmaps
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
 #
 
 include ./Makefile.am
diff --git a/pidgin/pixmaps/buddy_icons/qq/Makefile.mingw b/pidgin/pixmaps/buddy_icons/qq/Makefile.mingw
index 09634dcde7..0fa515c8ed 100644
--- a/pidgin/pixmaps/buddy_icons/qq/Makefile.mingw
+++ b/pidgin/pixmaps/buddy_icons/qq/Makefile.mingw
@@ -1,14 +1,14 @@
 #
 ## Makefile.mingw
 #
-## Description: Makefile for win32 (mingw) version of Gaim QQ buddy icons
+## Description: Makefile for win32 (mingw) version of Pidgin QQ buddy icons
 #
 #
 
-GAIM_TOP = ../../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP = ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
-datadir = $(GAIM_INSTALL_DIR)
+datadir = $(PIDGIN_INSTALL_DIR)
 include ./Makefile.am
 
 install:
diff --git a/pidgin/pixmaps/dialogs/16/Makefile.mingw b/pidgin/pixmaps/dialogs/16/Makefile.mingw
index 2a4588a3a6..959db84c57 100644
--- a/pidgin/pixmaps/dialogs/16/Makefile.mingw
+++ b/pidgin/pixmaps/dialogs/16/Makefile.mingw
@@ -1,20 +1,20 @@
-#

-# Makefile.mingw

-#

-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps

-#

-

-GAIM_TOP := ../../../..

-include $(GAIM_TOP)/libpurple/win32/global.mak

-

-datadir = $(GAIM_INSTALL_DIR)

-include ./Makefile.am

-

-.PHONY: install

-

-install:

-	if test '$(pidgindialogpix_DATA)'; then \

-	  mkdir -p $(pidgindialogpixdir); \

-	  cp $(pidgindialogpix_DATA) $(pidgindialogpixdir); \

-	fi;

-

+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidgindialogpix_DATA)'; then \
+	  mkdir -p $(pidgindialogpixdir); \
+	  cp $(pidgindialogpix_DATA) $(pidgindialogpixdir); \
+	fi;
+
diff --git a/pidgin/pixmaps/dialogs/64/Makefile.mingw b/pidgin/pixmaps/dialogs/64/Makefile.mingw
index 2a4588a3a6..959db84c57 100644
--- a/pidgin/pixmaps/dialogs/64/Makefile.mingw
+++ b/pidgin/pixmaps/dialogs/64/Makefile.mingw
@@ -1,20 +1,20 @@
-#

-# Makefile.mingw

-#

-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps

-#

-

-GAIM_TOP := ../../../..

-include $(GAIM_TOP)/libpurple/win32/global.mak

-

-datadir = $(GAIM_INSTALL_DIR)

-include ./Makefile.am

-

-.PHONY: install

-

-install:

-	if test '$(pidgindialogpix_DATA)'; then \

-	  mkdir -p $(pidgindialogpixdir); \

-	  cp $(pidgindialogpix_DATA) $(pidgindialogpixdir); \

-	fi;

-

+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidgindialogpix_DATA)'; then \
+	  mkdir -p $(pidgindialogpixdir); \
+	  cp $(pidgindialogpix_DATA) $(pidgindialogpixdir); \
+	fi;
+
diff --git a/pidgin/pixmaps/dialogs/Makefile.mingw b/pidgin/pixmaps/dialogs/Makefile.mingw
index 25dd032d6a..d497bd4098 100644
--- a/pidgin/pixmaps/dialogs/Makefile.mingw
+++ b/pidgin/pixmaps/dialogs/Makefile.mingw
@@ -1,16 +1,16 @@
-#

-# Makefile.mingw

-#

-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps

-#

-

-include ./Makefile.am

-

-.PHONY: install

-

-install:

-	if test '$(SUBDIRS)'; then \

-	  list='$(SUBDIRS)'; for subdir in $$list; do \

-	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \

-	  done; \

-	fi;

+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(SUBDIRS)'; then \
+	  list='$(SUBDIRS)'; for subdir in $$list; do \
+	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \
+	  done; \
+	fi;
diff --git a/pidgin/pixmaps/emblems/16/Makefile.mingw b/pidgin/pixmaps/emblems/16/Makefile.mingw
index dc07d620a6..b85f38f156 100644
--- a/pidgin/pixmaps/emblems/16/Makefile.mingw
+++ b/pidgin/pixmaps/emblems/16/Makefile.mingw
@@ -1,20 +1,20 @@
-#

-# Makefile.mingw

-#

-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps

-#

-

-GAIM_TOP := ../../../..

-include $(GAIM_TOP)/libpurple/win32/global.mak

-

-datadir = $(GAIM_INSTALL_DIR)

-include ./Makefile.am

-

-.PHONY: install

-

-install:

-	if test '$(pidginemblempix_DATA)'; then \

-	  mkdir -p $(pidginemblempixdir); \

-	  cp $(pidginemblempix_DATA) $(pidginemblempixdir); \

-	fi;

-

+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidginemblempix_DATA)'; then \
+	  mkdir -p $(pidginemblempixdir); \
+	  cp $(pidginemblempix_DATA) $(pidginemblempixdir); \
+	fi;
+
diff --git a/pidgin/pixmaps/emblems/Makefile.mingw b/pidgin/pixmaps/emblems/Makefile.mingw
index 25dd032d6a..d497bd4098 100644
--- a/pidgin/pixmaps/emblems/Makefile.mingw
+++ b/pidgin/pixmaps/emblems/Makefile.mingw
@@ -1,16 +1,16 @@
-#

-# Makefile.mingw

-#

-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps

-#

-

-include ./Makefile.am

-

-.PHONY: install

-

-install:

-	if test '$(SUBDIRS)'; then \

-	  list='$(SUBDIRS)'; for subdir in $$list; do \

-	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \

-	  done; \

-	fi;

+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(SUBDIRS)'; then \
+	  list='$(SUBDIRS)'; for subdir in $$list; do \
+	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \
+	  done; \
+	fi;
diff --git a/pidgin/pixmaps/emotes/Makefile.mingw b/pidgin/pixmaps/emotes/Makefile.mingw
index 25dd032d6a..d497bd4098 100644
--- a/pidgin/pixmaps/emotes/Makefile.mingw
+++ b/pidgin/pixmaps/emotes/Makefile.mingw
@@ -1,16 +1,16 @@
-#

-# Makefile.mingw

-#

-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps

-#

-

-include ./Makefile.am

-

-.PHONY: install

-

-install:

-	if test '$(SUBDIRS)'; then \

-	  list='$(SUBDIRS)'; for subdir in $$list; do \

-	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \

-	  done; \

-	fi;

+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(SUBDIRS)'; then \
+	  list='$(SUBDIRS)'; for subdir in $$list; do \
+	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \
+	  done; \
+	fi;
diff --git a/pidgin/pixmaps/emotes/default/22/Makefile.mingw b/pidgin/pixmaps/emotes/default/22/Makefile.mingw
index 8c2c0a70e4..b2f7956668 100644
--- a/pidgin/pixmaps/emotes/default/22/Makefile.mingw
+++ b/pidgin/pixmaps/emotes/default/22/Makefile.mingw
@@ -1,20 +1,20 @@
-#

-# Makefile.mingw

-#

-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps

-#

-

-GAIM_TOP := ../../../../..

-include $(GAIM_TOP)/libpurple/win32/global.mak

-

-datadir = $(GAIM_INSTALL_DIR)

-include ./Makefile.am

-

-.PHONY: install

-

-install:

-	if test '$(pidginsmileypix_DATA)'; then \

-	  mkdir -p $(pidginsmileypixdir); \

-	  cp $(pidginsmileypix_DATA) $(pidginsmileypixdir); \

-	fi;

-

+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidginsmileypix_DATA)'; then \
+	  mkdir -p $(pidginsmileypixdir); \
+	  cp $(pidginsmileypix_DATA) $(pidginsmileypixdir); \
+	fi;
+
diff --git a/pidgin/pixmaps/emotes/default/Makefile.mingw b/pidgin/pixmaps/emotes/default/Makefile.mingw
index 25dd032d6a..d497bd4098 100644
--- a/pidgin/pixmaps/emotes/default/Makefile.mingw
+++ b/pidgin/pixmaps/emotes/default/Makefile.mingw
@@ -1,16 +1,16 @@
-#

-# Makefile.mingw

-#

-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps

-#

-

-include ./Makefile.am

-

-.PHONY: install

-

-install:

-	if test '$(SUBDIRS)'; then \

-	  list='$(SUBDIRS)'; for subdir in $$list; do \

-	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \

-	  done; \

-	fi;

+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(SUBDIRS)'; then \
+	  list='$(SUBDIRS)'; for subdir in $$list; do \
+	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \
+	  done; \
+	fi;
diff --git a/pidgin/pixmaps/emotes/none/Makefile.mingw b/pidgin/pixmaps/emotes/none/Makefile.mingw
index 85d382d45b..a5955872d9 100644
--- a/pidgin/pixmaps/emotes/none/Makefile.mingw
+++ b/pidgin/pixmaps/emotes/none/Makefile.mingw
@@ -1,20 +1,20 @@
-#

-# Makefile.mingw

-#

-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps

-#

-

-GAIM_TOP := ../../../..

-include $(GAIM_TOP)/libpurple/win32/global.mak

-

-datadir = $(GAIM_INSTALL_DIR)

-include ./Makefile.am

-

-.PHONY: install

-

-install:

-	if test '$(gaimsmileypix_DATA)'; then \

-	  mkdir -p $(gaimsmileypixdir); \

-	  cp $(gaimsmileypix_DATA) $(gaimsmileypixdir); \

-	fi;

-

+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidginsmileypix_DATA)'; then \
+	  mkdir -p $(pidginsmileypixdir); \
+	  cp $(pidginsmileypix_DATA) $(pidginsmileypixdir); \
+	fi;
+
diff --git a/pidgin/pixmaps/icons/16/Makefile.mingw b/pidgin/pixmaps/icons/16/Makefile.mingw
index 48de9c2a4f..24a402def9 100644
--- a/pidgin/pixmaps/icons/16/Makefile.mingw
+++ b/pidgin/pixmaps/icons/16/Makefile.mingw
@@ -1,20 +1,20 @@
-#

-# Makefile.mingw

-#

-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps

-#

-

-GAIM_TOP := ../../../..

-include $(GAIM_TOP)/libpurple/win32/global.mak

-

-datadir = $(GAIM_INSTALL_DIR)

-include ./Makefile.am

-

-.PHONY: install

-

-install:

-	if test '$(pidginiconspix_DATA)'; then \

-	  mkdir -p $(pidginiconspixdir); \

-	  cp $(pidginiconspix_DATA) $(pidginiconspixdir); \

-	fi;

-

+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidginiconspix_DATA)'; then \
+	  mkdir -p $(pidginiconspixdir); \
+	  cp $(pidginiconspix_DATA) $(pidginiconspixdir); \
+	fi;
+
diff --git a/pidgin/pixmaps/icons/24/Makefile.mingw b/pidgin/pixmaps/icons/24/Makefile.mingw
index 48de9c2a4f..24a402def9 100644
--- a/pidgin/pixmaps/icons/24/Makefile.mingw
+++ b/pidgin/pixmaps/icons/24/Makefile.mingw
@@ -1,20 +1,20 @@
-#

-# Makefile.mingw

-#

-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps

-#

-

-GAIM_TOP := ../../../..

-include $(GAIM_TOP)/libpurple/win32/global.mak

-

-datadir = $(GAIM_INSTALL_DIR)

-include ./Makefile.am

-

-.PHONY: install

-

-install:

-	if test '$(pidginiconspix_DATA)'; then \

-	  mkdir -p $(pidginiconspixdir); \

-	  cp $(pidginiconspix_DATA) $(pidginiconspixdir); \

-	fi;

-

+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidginiconspix_DATA)'; then \
+	  mkdir -p $(pidginiconspixdir); \
+	  cp $(pidginiconspix_DATA) $(pidginiconspixdir); \
+	fi;
+
diff --git a/pidgin/pixmaps/icons/32/Makefile.mingw b/pidgin/pixmaps/icons/32/Makefile.mingw
index 48de9c2a4f..24a402def9 100644
--- a/pidgin/pixmaps/icons/32/Makefile.mingw
+++ b/pidgin/pixmaps/icons/32/Makefile.mingw
@@ -1,20 +1,20 @@
-#

-# Makefile.mingw

-#

-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps

-#

-

-GAIM_TOP := ../../../..

-include $(GAIM_TOP)/libpurple/win32/global.mak

-

-datadir = $(GAIM_INSTALL_DIR)

-include ./Makefile.am

-

-.PHONY: install

-

-install:

-	if test '$(pidginiconspix_DATA)'; then \

-	  mkdir -p $(pidginiconspixdir); \

-	  cp $(pidginiconspix_DATA) $(pidginiconspixdir); \

-	fi;

-

+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidginiconspix_DATA)'; then \
+	  mkdir -p $(pidginiconspixdir); \
+	  cp $(pidginiconspix_DATA) $(pidginiconspixdir); \
+	fi;
+
diff --git a/pidgin/pixmaps/icons/48/Makefile.mingw b/pidgin/pixmaps/icons/48/Makefile.mingw
index 48de9c2a4f..24a402def9 100644
--- a/pidgin/pixmaps/icons/48/Makefile.mingw
+++ b/pidgin/pixmaps/icons/48/Makefile.mingw
@@ -1,20 +1,20 @@
-#

-# Makefile.mingw

-#

-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps

-#

-

-GAIM_TOP := ../../../..

-include $(GAIM_TOP)/libpurple/win32/global.mak

-

-datadir = $(GAIM_INSTALL_DIR)

-include ./Makefile.am

-

-.PHONY: install

-

-install:

-	if test '$(pidginiconspix_DATA)'; then \

-	  mkdir -p $(pidginiconspixdir); \

-	  cp $(pidginiconspix_DATA) $(pidginiconspixdir); \

-	fi;

-

+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidginiconspix_DATA)'; then \
+	  mkdir -p $(pidginiconspixdir); \
+	  cp $(pidginiconspix_DATA) $(pidginiconspixdir); \
+	fi;
+
diff --git a/pidgin/pixmaps/icons/Makefile.mingw b/pidgin/pixmaps/icons/Makefile.mingw
index 91a9144b4a..c57e696b27 100644
--- a/pidgin/pixmaps/icons/Makefile.mingw
+++ b/pidgin/pixmaps/icons/Makefile.mingw
@@ -1,7 +1,7 @@
 #
 # Makefile.mingw
 #
-# Description: Makefile for win32 (mingw) version of Gaim pixmaps
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
 #
 
 include ./Makefile.am
diff --git a/pidgin/pixmaps/protocols/16/Makefile.mingw b/pidgin/pixmaps/protocols/16/Makefile.mingw
index c714503159..59c8dd9bbc 100644
--- a/pidgin/pixmaps/protocols/16/Makefile.mingw
+++ b/pidgin/pixmaps/protocols/16/Makefile.mingw
@@ -1,20 +1,20 @@
-#

-# Makefile.mingw

-#

-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps

-#

-

-GAIM_TOP := ../../../..

-include $(GAIM_TOP)/libpurple/win32/global.mak

-

-datadir = $(GAIM_INSTALL_DIR)

-include ./Makefile.am

-

-.PHONY: install

-

-install:

-	if test '$(pidginprotocolpix_DATA)'; then \

-	  mkdir -p $(pidginprotocolpixdir); \

-	  cp $(pidginprotocolpix_DATA) $(pidginprotocolpixdir); \

-	fi;

-

+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidginprotocolpix_DATA)'; then \
+	  mkdir -p $(pidginprotocolpixdir); \
+	  cp $(pidginprotocolpix_DATA) $(pidginprotocolpixdir); \
+	fi;
+
diff --git a/pidgin/pixmaps/protocols/22/Makefile.mingw b/pidgin/pixmaps/protocols/22/Makefile.mingw
index c714503159..59c8dd9bbc 100644
--- a/pidgin/pixmaps/protocols/22/Makefile.mingw
+++ b/pidgin/pixmaps/protocols/22/Makefile.mingw
@@ -1,20 +1,20 @@
-#

-# Makefile.mingw

-#

-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps

-#

-

-GAIM_TOP := ../../../..

-include $(GAIM_TOP)/libpurple/win32/global.mak

-

-datadir = $(GAIM_INSTALL_DIR)

-include ./Makefile.am

-

-.PHONY: install

-

-install:

-	if test '$(pidginprotocolpix_DATA)'; then \

-	  mkdir -p $(pidginprotocolpixdir); \

-	  cp $(pidginprotocolpix_DATA) $(pidginprotocolpixdir); \

-	fi;

-

+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidginprotocolpix_DATA)'; then \
+	  mkdir -p $(pidginprotocolpixdir); \
+	  cp $(pidginprotocolpix_DATA) $(pidginprotocolpixdir); \
+	fi;
+
diff --git a/pidgin/pixmaps/protocols/48/Makefile.mingw b/pidgin/pixmaps/protocols/48/Makefile.mingw
index c714503159..59c8dd9bbc 100644
--- a/pidgin/pixmaps/protocols/48/Makefile.mingw
+++ b/pidgin/pixmaps/protocols/48/Makefile.mingw
@@ -1,20 +1,20 @@
-#

-# Makefile.mingw

-#

-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps

-#

-

-GAIM_TOP := ../../../..

-include $(GAIM_TOP)/libpurple/win32/global.mak

-

-datadir = $(GAIM_INSTALL_DIR)

-include ./Makefile.am

-

-.PHONY: install

-

-install:

-	if test '$(pidginprotocolpix_DATA)'; then \

-	  mkdir -p $(pidginprotocolpixdir); \

-	  cp $(pidginprotocolpix_DATA) $(pidginprotocolpixdir); \

-	fi;

-

+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidginprotocolpix_DATA)'; then \
+	  mkdir -p $(pidginprotocolpixdir); \
+	  cp $(pidginprotocolpix_DATA) $(pidginprotocolpixdir); \
+	fi;
+
diff --git a/pidgin/pixmaps/protocols/Makefile.mingw b/pidgin/pixmaps/protocols/Makefile.mingw
index 25dd032d6a..d497bd4098 100644
--- a/pidgin/pixmaps/protocols/Makefile.mingw
+++ b/pidgin/pixmaps/protocols/Makefile.mingw
@@ -1,16 +1,16 @@
-#

-# Makefile.mingw

-#

-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps

-#

-

-include ./Makefile.am

-

-.PHONY: install

-

-install:

-	if test '$(SUBDIRS)'; then \

-	  list='$(SUBDIRS)'; for subdir in $$list; do \

-	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \

-	  done; \

-	fi;

+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(SUBDIRS)'; then \
+	  list='$(SUBDIRS)'; for subdir in $$list; do \
+	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \
+	  done; \
+	fi;
diff --git a/pidgin/pixmaps/status/16/Makefile.mingw b/pidgin/pixmaps/status/16/Makefile.mingw
index ed3627d171..97b16e1f6b 100644
--- a/pidgin/pixmaps/status/16/Makefile.mingw
+++ b/pidgin/pixmaps/status/16/Makefile.mingw
@@ -1,20 +1,20 @@
-#

-# Makefile.mingw

-#

-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps

-#

-

-GAIM_TOP := ../../../..

-include $(GAIM_TOP)/libpurple/win32/global.mak

-

-datadir = $(GAIM_INSTALL_DIR)

-include ./Makefile.am

-

-.PHONY: install

-

-install:

-	if test '$(pidginstatuspix_DATA)'; then \

-	  mkdir -p $(pidginstatuspixdir); \

-	  cp $(pidginstatuspix_DATA) $(pidginstatuspixdir); \

-	fi;

-

+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidginstatuspix_DATA)'; then \
+	  mkdir -p $(pidginstatuspixdir); \
+	  cp $(pidginstatuspix_DATA) $(pidginstatuspixdir); \
+	fi;
+
diff --git a/pidgin/pixmaps/status/22/Makefile.mingw b/pidgin/pixmaps/status/22/Makefile.mingw
index ed3627d171..97b16e1f6b 100644
--- a/pidgin/pixmaps/status/22/Makefile.mingw
+++ b/pidgin/pixmaps/status/22/Makefile.mingw
@@ -1,20 +1,20 @@
-#

-# Makefile.mingw

-#

-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps

-#

-

-GAIM_TOP := ../../../..

-include $(GAIM_TOP)/libpurple/win32/global.mak

-

-datadir = $(GAIM_INSTALL_DIR)

-include ./Makefile.am

-

-.PHONY: install

-

-install:

-	if test '$(pidginstatuspix_DATA)'; then \

-	  mkdir -p $(pidginstatuspixdir); \

-	  cp $(pidginstatuspix_DATA) $(pidginstatuspixdir); \

-	fi;

-

+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidginstatuspix_DATA)'; then \
+	  mkdir -p $(pidginstatuspixdir); \
+	  cp $(pidginstatuspix_DATA) $(pidginstatuspixdir); \
+	fi;
+
diff --git a/pidgin/pixmaps/status/32/Makefile.mingw b/pidgin/pixmaps/status/32/Makefile.mingw
index ed3627d171..97b16e1f6b 100644
--- a/pidgin/pixmaps/status/32/Makefile.mingw
+++ b/pidgin/pixmaps/status/32/Makefile.mingw
@@ -1,20 +1,20 @@
-#

-# Makefile.mingw

-#

-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps

-#

-

-GAIM_TOP := ../../../..

-include $(GAIM_TOP)/libpurple/win32/global.mak

-

-datadir = $(GAIM_INSTALL_DIR)

-include ./Makefile.am

-

-.PHONY: install

-

-install:

-	if test '$(pidginstatuspix_DATA)'; then \

-	  mkdir -p $(pidginstatuspixdir); \

-	  cp $(pidginstatuspix_DATA) $(pidginstatuspixdir); \

-	fi;

-

+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidginstatuspix_DATA)'; then \
+	  mkdir -p $(pidginstatuspixdir); \
+	  cp $(pidginstatuspix_DATA) $(pidginstatuspixdir); \
+	fi;
+
diff --git a/pidgin/pixmaps/status/48/Makefile.mingw b/pidgin/pixmaps/status/48/Makefile.mingw
index ed3627d171..97b16e1f6b 100644
--- a/pidgin/pixmaps/status/48/Makefile.mingw
+++ b/pidgin/pixmaps/status/48/Makefile.mingw
@@ -1,20 +1,20 @@
-#

-# Makefile.mingw

-#

-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps

-#

-

-GAIM_TOP := ../../../..

-include $(GAIM_TOP)/libpurple/win32/global.mak

-

-datadir = $(GAIM_INSTALL_DIR)

-include ./Makefile.am

-

-.PHONY: install

-

-install:

-	if test '$(pidginstatuspix_DATA)'; then \

-	  mkdir -p $(pidginstatuspixdir); \

-	  cp $(pidginstatuspix_DATA) $(pidginstatuspixdir); \

-	fi;

-

+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidginstatuspix_DATA)'; then \
+	  mkdir -p $(pidginstatuspixdir); \
+	  cp $(pidginstatuspix_DATA) $(pidginstatuspixdir); \
+	fi;
+
diff --git a/pidgin/pixmaps/status/Makefile.mingw b/pidgin/pixmaps/status/Makefile.mingw
index 91a9144b4a..c57e696b27 100644
--- a/pidgin/pixmaps/status/Makefile.mingw
+++ b/pidgin/pixmaps/status/Makefile.mingw
@@ -1,7 +1,7 @@
 #
 # Makefile.mingw
 #
-# Description: Makefile for win32 (mingw) version of Gaim pixmaps
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
 #
 
 include ./Makefile.am
diff --git a/pidgin/pixmaps/status/default/Makefile.mingw b/pidgin/pixmaps/status/default/Makefile.mingw
index 05dd5b4d3e..2176df1d4c 100644
--- a/pidgin/pixmaps/status/default/Makefile.mingw
+++ b/pidgin/pixmaps/status/default/Makefile.mingw
@@ -1,18 +1,18 @@
 #
 # Makefile.mingw
 #
-# Description: Makefile for win32 (mingw) version of Gaim pixmaps
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
 #
 
-GAIM_TOP = ../../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP = ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
-datadir = $(GAIM_INSTALL_DIR)
+datadir = $(PIDGIN_INSTALL_DIR)
 include ./Makefile.am
 
 install:
-	if test '$(gaimstatuspix_DATA)'; then \
-	  mkdir -p $(gaimstatuspixdir); \
-	  cp $(gaimstatuspix_DATA) $(gaimstatuspixdir); \
+	if test '$(pidginstatuspix_DATA)'; then \
+	  mkdir -p $(pidginstatuspixdir); \
+	  cp $(pidginstatuspix_DATA) $(pidginstatuspixdir); \
 	fi;
 
diff --git a/pidgin/pixmaps/toolbar/16/Makefile.mingw b/pidgin/pixmaps/toolbar/16/Makefile.mingw
index b3d7e2056f..5bb59f04c6 100644
--- a/pidgin/pixmaps/toolbar/16/Makefile.mingw
+++ b/pidgin/pixmaps/toolbar/16/Makefile.mingw
@@ -1,20 +1,20 @@
-#

-# Makefile.mingw

-#

-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps

-#

-

-GAIM_TOP := ../../../..

-include $(GAIM_TOP)/libpurple/win32/global.mak

-

-datadir = $(GAIM_INSTALL_DIR)

-include ./Makefile.am

-

-.PHONY: install

-

-install:

-	if test '$(pidgintoolbarpix_DATA)'; then \

-	  mkdir -p $(pidgintoolbarpixdir); \

-	  cp $(pidgintoolbarpix_DATA) $(pidgintoolbarpixdir); \

-	fi;

-

+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidgintoolbarpix_DATA)'; then \
+	  mkdir -p $(pidgintoolbarpixdir); \
+	  cp $(pidgintoolbarpix_DATA) $(pidgintoolbarpixdir); \
+	fi;
+
diff --git a/pidgin/pixmaps/tray/16/Makefile.mingw b/pidgin/pixmaps/tray/16/Makefile.mingw
index 64b0abdfa0..a0f2864633 100644
--- a/pidgin/pixmaps/tray/16/Makefile.mingw
+++ b/pidgin/pixmaps/tray/16/Makefile.mingw
@@ -1,20 +1,20 @@
-#

-# Makefile.mingw

-#

-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps

-#

-

-GAIM_TOP := ../../../..

-include $(GAIM_TOP)/libpurple/win32/global.mak

-

-datadir = $(GAIM_INSTALL_DIR)

-include ./Makefile.am

-

-.PHONY: install

-

-install:

-	if test '$(pidgintraypix_DATA)'; then \

-	  mkdir -p $(pidgintraypixdir); \

-	  cp $(pidgintraypix_DATA) $(pidgintraypixdir); \

-	fi;

-

+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidgintraypix_DATA)'; then \
+	  mkdir -p $(pidgintraypixdir); \
+	  cp $(pidgintraypix_DATA) $(pidgintraypixdir); \
+	fi;
+
diff --git a/pidgin/pixmaps/tray/22/Makefile.mingw b/pidgin/pixmaps/tray/22/Makefile.mingw
index 64b0abdfa0..a0f2864633 100644
--- a/pidgin/pixmaps/tray/22/Makefile.mingw
+++ b/pidgin/pixmaps/tray/22/Makefile.mingw
@@ -1,20 +1,20 @@
-#

-# Makefile.mingw

-#

-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps

-#

-

-GAIM_TOP := ../../../..

-include $(GAIM_TOP)/libpurple/win32/global.mak

-

-datadir = $(GAIM_INSTALL_DIR)

-include ./Makefile.am

-

-.PHONY: install

-

-install:

-	if test '$(pidgintraypix_DATA)'; then \

-	  mkdir -p $(pidgintraypixdir); \

-	  cp $(pidgintraypix_DATA) $(pidgintraypixdir); \

-	fi;

-

+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidgintraypix_DATA)'; then \
+	  mkdir -p $(pidgintraypixdir); \
+	  cp $(pidgintraypix_DATA) $(pidgintraypixdir); \
+	fi;
+
diff --git a/pidgin/pixmaps/tray/Makefile.mingw b/pidgin/pixmaps/tray/Makefile.mingw
index 91a9144b4a..c57e696b27 100644
--- a/pidgin/pixmaps/tray/Makefile.mingw
+++ b/pidgin/pixmaps/tray/Makefile.mingw
@@ -1,7 +1,7 @@
 #
 # Makefile.mingw
 #
-# Description: Makefile for win32 (mingw) version of Gaim pixmaps
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
 #
 
 include ./Makefile.am
diff --git a/pidgin/plugins/Makefile.mingw b/pidgin/plugins/Makefile.mingw
index 6fae3555db..9356111a2f 100644
--- a/pidgin/plugins/Makefile.mingw
+++ b/pidgin/plugins/Makefile.mingw
@@ -1,11 +1,11 @@
 #
 # Makefile.mingw
 #
-# Description: Makefile for win32 (mingw) version of Gaim Plugins 
+# Description: Makefile for win32 (mingw) version of Pidgin Plugins 
 #
 
-GAIM_TOP := ../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 GTKPERL_PLUGIN := ./perl
 TICKER_PLUGIN := ./ticker
@@ -26,15 +26,15 @@ INCLUDE_PATHS +=	\
 			-I$(GTK_TOP)/include/atk-1.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
 			-I$(GTK_TOP)/lib/gtk-2.0/include \
-			-I$(GAIM_TOP) \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_GTK_TOP) \
-			-I$(GAIM_GTK_TOP)/win32
+			-I$(PIDGIN_TREE_TOP) \
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TOP) \
+			-I$(PIDGIN_TOP)/win32
 
 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(GAIM_LIB_TOP) \
-			-L$(GAIM_GTK_TOP)
+			-L$(PURPLE_TOP) \
+			-L$(PIDGIN_TOP)
 
 ##
 ## LIBRARIES
@@ -57,17 +57,17 @@ LIBS =			-lgtk-win32-2.0 \
 .PHONY: all clean plugins install
 
 all: plugins
-#	$(MAKE) -C $(GTKPERL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE)
-	$(MAKE) -C $(TICKER_PLUGIN) -f $(GAIM_WIN32_MAKEFILE)
-	$(MAKE) -C $(TRANSPARENCY_PLUGIN) -f $(GAIM_WIN32_MAKEFILE)
-	$(MAKE) -C $(WINPREFS_PLUGIN) -f $(GAIM_WIN32_MAKEFILE)
+#	$(MAKE) -C $(GTKPERL_PLUGIN) -f $(MINGW_MAKEFILE)
+	$(MAKE) -C $(TICKER_PLUGIN) -f $(MINGW_MAKEFILE)
+	$(MAKE) -C $(TRANSPARENCY_PLUGIN) -f $(MINGW_MAKEFILE)
+	$(MAKE) -C $(WINPREFS_PLUGIN) -f $(MINGW_MAKEFILE)
 
-install: all $(GAIM_INSTALL_PLUGINS_DIR)
-#	$(MAKE) -C $(GTKPERL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install
-	$(MAKE) -C $(TICKER_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install
-	$(MAKE) -C $(TRANSPARENCY_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install
-	$(MAKE) -C $(WINPREFS_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install
-	cp *.dll $(GAIM_INSTALL_PLUGINS_DIR)
+install: all $(PIDGIN_INSTALL_PLUGINS_DIR)
+#	$(MAKE) -C $(GTKPERL_PLUGIN) -f $(MINGW_MAKEFILE) install
+	$(MAKE) -C $(TICKER_PLUGIN) -f $(MINGW_MAKEFILE) install
+	$(MAKE) -C $(TRANSPARENCY_PLUGIN) -f $(MINGW_MAKEFILE) install
+	$(MAKE) -C $(WINPREFS_PLUGIN) -f $(MINGW_MAKEFILE) install
+	cp *.dll $(PIDGIN_INSTALL_PLUGINS_DIR)
 
 .c.dll:
 	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@.o -c $<
@@ -91,9 +91,9 @@ plugins: \
 ##
 clean:
 	rm -f *.o *.dll
-	$(MAKE) -C $(GTKPERL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) clean
-	$(MAKE) -C $(TICKER_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) clean
-	$(MAKE) -C $(TRANSPARENCY_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) clean
-	$(MAKE) -C $(WINPREFS_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) clean
+	$(MAKE) -C $(GTKPERL_PLUGIN) -f $(MINGW_MAKEFILE) clean
+	$(MAKE) -C $(TICKER_PLUGIN) -f $(MINGW_MAKEFILE) clean
+	$(MAKE) -C $(TRANSPARENCY_PLUGIN) -f $(MINGW_MAKEFILE) clean
+	$(MAKE) -C $(WINPREFS_PLUGIN) -f $(MINGW_MAKEFILE) clean
 
-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
diff --git a/pidgin/plugins/perl/Makefile.mingw b/pidgin/plugins/perl/Makefile.mingw
index 4e9897682e..d118836b45 100644
--- a/pidgin/plugins/perl/Makefile.mingw
+++ b/pidgin/plugins/perl/Makefile.mingw
@@ -4,8 +4,8 @@
 # Description: Makefile for perl plugin loader plugin.
 #
 
-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 ##
 ## TARGET DEFINITIONS
@@ -13,13 +13,13 @@ include $(GAIM_TOP)/libpurple/win32/global.mak
 .PHONY: all install clean
 
 all:
-	$(MAKE) -C ./common -f $(GAIM_WIN32_MAKEFILE)
+	$(MAKE) -C ./common -f $(MINGW_MAKEFILE)
 
-install: all $(GAIM_INSTALL_PLUGINS_DIR)
-	$(MAKE) -C ./common -f $(GAIM_WIN32_MAKEFILE) install
+install: all $(PIDGIN_INSTALL_PLUGINS_DIR)
+	$(MAKE) -C ./common -f $(MINGW_MAKEFILE) install
 
 ##
 ## CLEAN RULES
 ##
 clean:
-	$(MAKE) -C ./common -f $(GAIM_WIN32_MAKEFILE) clean
+	$(MAKE) -C ./common -f $(MINGW_MAKEFILE) clean
diff --git a/pidgin/plugins/perl/common/Makefile.mingw b/pidgin/plugins/perl/common/Makefile.mingw
index 90868330e2..931f9b182b 100644
--- a/pidgin/plugins/perl/common/Makefile.mingw
+++ b/pidgin/plugins/perl/common/Makefile.mingw
@@ -1,11 +1,11 @@
 #
 # Makefile.mingw
 #
-# Description: Makefile for Gaim perl module.
+# Description: Makefile for Pidgin perl module.
 #
 
-GAIM_TOP := ../../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 TARGET = GtkUI
 EXTUTILS ?= C:/perl/lib/ExtUtils
@@ -16,10 +16,10 @@ CFLAGS += -Wno-comment -Wno-unused
 ## INCLUDE PATHS
 ##
 INCLUDE_PATHS =		-I. \
-			-I$(GAIM_TOP) \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_GTK_TOP) \
-			-I$(GAIM_GTK_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP) \
+			-I$(PURPLE_TOP) \
+			-I$(PIDGIN_TOP) \
+			-I$(PIDGIN_TOP)/win32 \
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/atk-1.0 \
 			-I$(GTK_TOP)/include/glib-2.0 \
@@ -30,9 +30,9 @@ INCLUDE_PATHS =		-I. \
 			-I$(PERL_LIB_TOP)/CORE
 
 LIB_PATHS = 		-L$(PERL_LIB_TOP) \
-			-L$(GAIM_LIB_TOP) \
-			-L$(GAIM_GTK_TOP) \
-			-L$(GAIM_LIB_PERL_TOP) \
+			-L$(PURPLE_TOP) \
+			-L$(PIDGIN_TOP) \
+			-L$(PURPLE_PERL_TOP) \
 			-L$(GTK_TOP)/lib
 
 ##
@@ -77,7 +77,7 @@ LIBS =			-lperl58 \
 			-lpidgin \
 			-lglib-2.0
 
-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)
 
 ##
 ## TARGETS
@@ -86,18 +86,18 @@ include $(GAIM_COMMON_RULES)
 
 all: $(TARGET).dll
 
-$(GAIM_INSTALL_PERLMOD_DIR)/Gaim.pm:
-	$(MAKE) -C $(GAIM_LIB_PERL_TOP)/common -f $(GAIM_WIN32_MAKEFILE) install
+$(PIDGIN_INSTALL_PERLMOD_DIR)/Pidgin.pm:
+	$(MAKE) -C $(PURPLE_PERL_TOP)/common -f $(MINGW_MAKEFILE) install
 
-install: all $(GAIM_INSTALL_PERLMOD_DIR)/Gaim.pm
-	rm -f $(GAIM_INSTALL_PERLMOD_DIR)/$(TARGET).dll $(GAIM_INSTALL_PERLMOD_DIR)/Gaim/$(TARGET).pm
-	mkdir -p $(GAIM_INSTALL_PERLMOD_DIR)/Gaim
-	cp $(TARGET).pm $(GAIM_INSTALL_PERLMOD_DIR)/Gaim/
-	cp $(TARGET).dll $(GAIM_INSTALL_PERLMOD_DIR)
+install: all $(PIDGIN_INSTALL_PERLMOD_DIR)/Pidgin.pm
+	rm -f $(PIDGIN_INSTALL_PERLMOD_DIR)/$(TARGET).dll $(PIDGIN_INSTALL_PERLMOD_DIR)/Pidgin/$(TARGET).pm
+	mkdir -p $(PIDGIN_INSTALL_PERLMOD_DIR)/Pidgin
+	cp $(TARGET).pm $(PIDGIN_INSTALL_PERLMOD_DIR)/Pidgin/
+	cp $(TARGET).dll $(PIDGIN_INSTALL_PERLMOD_DIR)
 
-$(C_FILES): $(GAIM_CONFIG_H)
+$(C_FILES): $(PIDGIN_CONFIG_H)
 
-$(TARGET).dll: $(GAIM_GTKGAIM_DLL).a $(GAIM_LIBGAIM_PERL_DLL).a $(OBJECTS)
+$(TARGET).dll: $(PIDGIN_DLL).a $(PURPLE_PERL_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) -o $(TARGET).dll
 
 ##
@@ -106,4 +106,4 @@ $(TARGET).dll: $(GAIM_GTKGAIM_DLL).a $(GAIM_LIBGAIM_PERL_DLL).a $(OBJECTS)
 clean:
 	rm -f *.o $(C_FILES) $(TARGET).dll
 
-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
diff --git a/pidgin/plugins/ticker/Makefile.mingw b/pidgin/plugins/ticker/Makefile.mingw
index f7795e321c..854ad8a8f3 100644
--- a/pidgin/plugins/ticker/Makefile.mingw
+++ b/pidgin/plugins/ticker/Makefile.mingw
@@ -4,8 +4,8 @@
 # Description: Makefile for ticker plugin.
 #
 
-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 TARGET = ticker
 
@@ -20,15 +20,15 @@ INCLUDE_PATHS +=	-I. \
 			-I$(GTK_TOP)/include/atk-1.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
 			-I$(GTK_TOP)/lib/gtk-2.0/include \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_GTK_TOP) \
-			-I$(GAIM_GTK_TOP)/win32 \
-			-I$(GAIM_TOP)
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TOP) \
+			-I$(PIDGIN_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP)
 
 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(GAIM_LIB_TOP) \
-			-L$(GAIM_GTK_TOP)
+			-L$(PURPLE_TOP) \
+			-L$(PIDGIN_TOP)
 
 ##
 ##  SOURCES, OBJECTS
@@ -49,7 +49,7 @@ LIBS =			-lgtk-win32-2.0 \
 			-lpurple \
 			-lpidgin
 
-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)
 
 ##
 ## TARGET DEFINITIONS
@@ -58,12 +58,12 @@ include $(GAIM_COMMON_RULES)
 
 all: $(TARGET).dll
 
-install: $(GAIM_INSTALL_PLUGINS_DIR)
-	cp $(TARGET).dll $(GAIM_INSTALL_PLUGINS_DIR)
+install: $(PIDGIN_INSTALL_PLUGINS_DIR)
+	cp $(TARGET).dll $(PIDGIN_INSTALL_PLUGINS_DIR)
 
-$(OBJECTS): $(GAIM_CONFIG_H)
+$(OBJECTS): $(PIDGIN_CONFIG_H)
 
-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(GAIM_GTKGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll: $(PURPLE_DLL).a $(PIDGIN_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll
 
 ##
@@ -73,4 +73,4 @@ clean:
 	rm -rf $(OBJECTS)
 	rm -rf $(TARGET).dll
 
-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
diff --git a/pidgin/plugins/win32/transparency/Makefile.mingw b/pidgin/plugins/win32/transparency/Makefile.mingw
index d3cfc4e7d3..1c757c67b8 100644
--- a/pidgin/plugins/win32/transparency/Makefile.mingw
+++ b/pidgin/plugins/win32/transparency/Makefile.mingw
@@ -4,8 +4,8 @@
 # Description: Makefile for win32trans plugin.
 #
 
-GAIM_TOP := ../../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 TARGET = win2ktrans
 DEFINES += -D_WIN32_WINNT=0x0500
@@ -21,15 +21,15 @@ INCLUDE_PATHS +=	-I. \
 			-I$(GTK_TOP)/include/atk-1.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
 			-I$(GTK_TOP)/lib/gtk-2.0/include \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_GTK_TOP) \
-			-I$(GAIM_GTK_TOP)/win32 \
-			-I$(GAIM_TOP)
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TOP) \
+			-I$(PIDGIN_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP)
 
 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(GAIM_LIB_TOP) \
-			-L$(GAIM_GTK_TOP)
+			-L$(PURPLE_TOP) \
+			-L$(PIDGIN_TOP)
 
 ##
 ##  SOURCES, OBJECTS
@@ -50,7 +50,7 @@ LIBS =			-lgtk-win32-2.0 \
 			-lpidgin \
 			-lpurple
 
-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)
 
 ##
 ## TARGET DEFINITIONS
@@ -59,10 +59,10 @@ include $(GAIM_COMMON_RULES)
 
 all: $(TARGET).dll
 
-install: all $(GAIM_INSTALL_PLUGINS_DIR)
-	cp $(TARGET).dll $(GAIM_INSTALL_PLUGINS_DIR)
+install: all $(PIDGIN_INSTALL_PLUGINS_DIR)
+	cp $(TARGET).dll $(PIDGIN_INSTALL_PLUGINS_DIR)
 
-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(GAIM_GTKGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll: $(PURPLE_DLL).a $(PIDGIN_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll
 
 ##
@@ -72,4 +72,4 @@ clean:
 	rm -rf $(OBJECTS)
 	rm -rf $(TARGET).dll
 
-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
diff --git a/pidgin/plugins/win32/winprefs/Makefile.mingw b/pidgin/plugins/win32/winprefs/Makefile.mingw
index 7ceef9603f..015a9793fa 100644
--- a/pidgin/plugins/win32/winprefs/Makefile.mingw
+++ b/pidgin/plugins/win32/winprefs/Makefile.mingw
@@ -4,8 +4,8 @@
 # Description: Makefile for winprefs plugin.
 #
 
-GAIM_TOP := ../../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 TARGET = winprefs
 DEFINES += -DWINVER=0x500
@@ -21,15 +21,15 @@ INCLUDE_PATHS +=	-I. \
 			-I$(GTK_TOP)/include/atk-1.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
 			-I$(GTK_TOP)/lib/gtk-2.0/include \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_GTK_TOP) \
-			-I$(GAIM_GTK_TOP)/win32 \
-			-I$(GAIM_TOP)
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TOP) \
+			-I$(PIDGIN_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP)
 
 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(GAIM_LIB_TOP) \
-			-L$(GAIM_GTK_TOP)
+			-L$(PURPLE_TOP) \
+			-L$(PIDGIN_TOP)
 
 ##
 ##  SOURCES, OBJECTS
@@ -52,7 +52,7 @@ LIBS =			-lgtk-win32-2.0 \
 			-lpurple \
 			-lpidgin
 
-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)
 
 ##
 ## TARGET DEFINITIONS
@@ -61,13 +61,13 @@ include $(GAIM_COMMON_RULES)
 
 all: $(TARGET).dll
 
-install: $(TARGET).dll $(GAIM_INSTALL_PLUGINS_DIR)
-	cp $(TARGET).dll $(GAIM_INSTALL_PLUGINS_DIR)
+install: $(TARGET).dll $(PIDGIN_INSTALL_PLUGINS_DIR)
+	cp $(TARGET).dll $(PIDGIN_INSTALL_PLUGINS_DIR)
 
 ##
 ## BUILD DLL
 ##
-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(GAIM_GTKGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll: $(PURPLE_DLL).a $(PIDGIN_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll
 
 ##
@@ -77,4 +77,4 @@ clean:
 	rm -rf $(OBJECTS)
 	rm -rf $(TARGET).dll
 
-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
diff --git a/pidgin/sounds/Makefile.mingw b/pidgin/sounds/Makefile.mingw
index 74cd91ec03..18310a955a 100644
--- a/pidgin/sounds/Makefile.mingw
+++ b/pidgin/sounds/Makefile.mingw
@@ -1,13 +1,13 @@
 #
 # Makefile.mingw
 #
-# Description: Makefile for win32 (mingw) version of Gaim sounds
+# Description: Makefile for win32 (mingw) version of Pidgin sounds
 #
 
-GAIM_TOP := ../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
-datadir := $(GAIM_INSTALL_DIR)
+datadir := $(PIDGIN_INSTALL_DIR)
 include ./Makefile.am
 
 .PHONY: install
diff --git a/pidgin/win32/IdleTracker/Makefile.mingw b/pidgin/win32/IdleTracker/Makefile.mingw
index 217cc6d058..8395da1411 100644
--- a/pidgin/win32/IdleTracker/Makefile.mingw
+++ b/pidgin/win32/IdleTracker/Makefile.mingw
@@ -4,8 +4,8 @@
 # Description: Makefile for idletrack
 #
 
-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 TARGET = idletrack
 
@@ -17,7 +17,7 @@ C_SRC =	idletrack.c
 
 OBJECTS = $(C_SRC:%.c=%.o)
 
-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)
 
 ##
 ## TARGET DEFINITIONS
@@ -27,8 +27,8 @@ include $(GAIM_COMMON_RULES)
 
 all: $(TARGET).dll
 
-install: $(GAIM_INSTALL_DIR)
-	cp $(TARGET).dll $(GAIM_INSTALL_DIR)
+install: $(PIDGIN_INSTALL_DIR)
+	cp $(TARGET).dll $(PIDGIN_INSTALL_DIR)
 
 ##
 ## BUILD DLL
@@ -44,4 +44,4 @@ $(TARGET).dll $(TARGET).dll.a: $(OBJECTS)
 clean:
 	rm -f $(OBJECTS) $(TARGET).dll $(TARGET).dll.a
 
-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
diff --git a/po/Makefile.mingw b/po/Makefile.mingw
index 76b454b3ed..2ffada376b 100644
--- a/po/Makefile.mingw
+++ b/po/Makefile.mingw
@@ -3,8 +3,8 @@
 # Description: Makefile to generate mo files
 #
 
-GAIM_TOP := ..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 PACKAGE = pidgin
 
@@ -33,19 +33,19 @@ CATALOGS = $(patsubst %.po,%.gmo,$(wildcard *.po))
 all: $(CATALOGS)
 
 install: all
-	mkdir -p $(GAIM_INSTALL_PO_DIR)
+	mkdir -p $(PURPLE_INSTALL_PO_DIR)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-	  dir=$(GAIM_INSTALL_PO_DIR)/$$lang/LC_MESSAGES; \
+	  dir=$(PURPLE_INSTALL_PO_DIR)/$$lang/LC_MESSAGES; \
 	  mkdir -p $$dir; \
 	  if test -r $$cat; then \
 	    cp $$cat $$dir/$(PACKAGE).mo; \
 	    echo "installing $$cat as $$dir/$(PACKAGE).mo"; \
 	  else \
-	    cp $(GAIM_PO_TOP)/$$cat $$dir/$(PACKAGE).mo; \
-	    echo "installing $(GAIM_PO_TOP)/$$cat as" \
+	    cp $(PURPLE_PO_TOP)/$$cat $$dir/$(PACKAGE).mo; \
+	    echo "installing $(PURPLE_PO_TOP)/$$cat as" \
 		 "$$dir/$(PACKAGE).mo"; \
 	  fi; \
 	done