Index: Makefile.mingw
===================================================================
RCS file: /cvsroot/gaim/gaim/Makefile.mingw,v
retrieving revision 1.39.2.1
diff -u -p -r1.39.2.1 Makefile.mingw
--- Makefile.mingw	17 Nov 2004 23:01:43 -0000	1.39.2.1
+++ Makefile.mingw	25 Mar 2005 01:33:39 -0000
@@ -27,6 +27,8 @@ NOVELL = $(GAIM_PROTOS)/novell
 SILC = $(GAIM_PROTOS)/silc
 PO = ./po
 
+MAKENSIS := makensis.exe
+
 VERSION := $(shell cat ./VERSION)
 
 NEEDED_DLLS =		$(GTKSPELL_TOP)/libgtkspell.dll \
@@ -91,13 +93,13 @@ install: all
 	cp $(SOUNDS) $(GAIM_INSTALL_DIR)/sounds/gaim
 
 installer:
-	makensis.exe /DGAIM_VERSION="$(VERSION)" /DWITH_GTK gaim-installer.nsi
+	$(MAKENSIS) -DGAIM_VERSION="$(VERSION)" -DWITH_GTK gaim-installer.nsi
 
 installer_nogtk:
-	makensis.exe /DGAIM_VERSION="$(VERSION)" gaim-installer.nsi
+	$(MAKENSIS) -DGAIM_VERSION="$(VERSION)" gaim-installer.nsi
 
 installer_debug:
-	makensis.exe /DGAIM_VERSION="$(VERSION)" /DDEBUG gaim-installer.nsi
+	$(MAKENSIS) -DGAIM_VERSION="$(VERSION)" -DDEBUG gaim-installer.nsi
 
 installers: installer installer_nogtk
 
Index: plugins/perl/Makefile.mingw
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/perl/Makefile.mingw,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile.mingw
--- plugins/perl/Makefile.mingw	29 Jan 2004 17:39:32 -0000	1.5
+++ plugins/perl/Makefile.mingw	25 Mar 2005 01:33:40 -0000
@@ -21,7 +21,7 @@ DLL_INSTALL_DIR :=	$(GAIM_INSTALL_DIR)/p
 
 TARGET = perl
 
-CC = gcc.exe
+CC := gcc.exe
 
 # Compiler Options
 
Index: plugins/perl/common/Makefile.mingw
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/perl/common/Makefile.mingw,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile.mingw
--- plugins/perl/common/Makefile.mingw	30 Oct 2003 19:21:14 -0000	1.2
+++ plugins/perl/common/Makefile.mingw	25 Mar 2005 01:33:40 -0000
@@ -11,8 +11,8 @@ AUTOSPLIT = lib/auto/Gaim/autosplit.ix
 ## TOOLS
 ##
 
-CC = gcc
-PERL = /cygdrive/c/perl/bin/perl
+CC := gcc
+PERL := /cygdrive/c/perl/bin/perl
 
 ##
 ## PATHS
Index: po/Makefile.mingw
===================================================================
RCS file: /cvsroot/gaim/gaim/po/Makefile.mingw,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile.mingw
--- po/Makefile.mingw	19 Aug 2003 16:07:09 -0000	1.4
+++ po/Makefile.mingw	25 Mar 2005 01:33:40 -0000
@@ -19,7 +19,7 @@ GTK_BIN = ../../win32-dev/gtk_2_0/bin
 ## TOOLS
 ##
 
-GMSGFMT = $(GTK_BIN)/msgfmt
+GMSGFMT := $(GTK_BIN)/msgfmt
 
 
 .SUFFIXES:
Index: src/Makefile.mingw
===================================================================
RCS file: /cvsroot/gaim/gaim/src/Makefile.mingw,v
retrieving revision 1.68.2.2
diff -u -p -r1.68.2.2 Makefile.mingw
--- src/Makefile.mingw	10 Feb 2005 00:07:00 -0000	1.68.2.2
+++ src/Makefile.mingw	25 Mar 2005 01:33:40 -0000
@@ -37,6 +37,8 @@ LDFLAGS = -mwindows
 #-mconsole
 #-mwindows
 
+WINDRES := windres
+
 ##
 ## INCLUDE  MAKEFILES
 ##
@@ -192,7 +194,7 @@ EXE_LIBS =
 
 # How to make an RC file
 %.o: %.rc
-	windres -i $< -o $@
+	$(WINDRES) -i $< -o $@
 
 ##
 ## TARGET DEFINITIONS
Index: plugins/guifications2/Makefile.mingw
===================================================================
RCS file: /cvsroot/guifications/guifications2/Makefile.mingw,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile.mingw
--- plugins/guifications2/Makefile.mingw	15 Aug 2004 12:22:53 -0000	1.4
+++ plugins/guifications2/Makefile.mingw	25 Mar 2005 01:33:50 -0000
@@ -13,6 +13,7 @@ GF_PIXMAPS :=		./pixmaps
 GF_THEMES :=		./themes
 GF_PO :=		./po
 
+MAKENSIS := 		makensis.exe
 ##
 ## VARIABLE DEFINITIONS
 ##
@@ -33,7 +34,7 @@ install: all
 
 
 installer: all
-	makensis.exe /DGUIFICATIONS_VERSION="$(GF_VERSION)" /DGAIM_VERSION="$(GAIM_VERSION)" guifications-installer.nsi
+	$(MAKENSIS) -DGUIFICATIONS_VERSION="$(GF_VERSION)" -DGAIM_VERSION="$(GAIM_VERSION)" guifications-installer.nsi
 
 clean:
 	$(MAKE) -C $(GF_SRC) -f Makefile.mingw clean