# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1113066727 0
# Node ID 6dcfec6f2f7c9ed38f2c1a465ffb85674b68e77d
# Parent  3595f818ee37e0420d951ff381459ba0d1ea1fb6
[gaim-migrate @ 12452]
make -f Makefile.mingw WINDRES=i386-mingw32-windres CC=i386-mingw32-gcc PERL=/usr/bin/perl EXTUTILS=/usr/lib/perl5/5.8.3/ExtUtils GMSGFMT=/usr/bin/msgfmt MAKENSIS=~/build/win32/win32-dev/NSIS/makensis install

committer: Tailor Script <tailor@pidgin.im>

diff -r 3595f818ee37 -r 6dcfec6f2f7c Makefile.mingw
--- a/Makefile.mingw	Sat Apr 09 16:36:11 2005 +0000
+++ b/Makefile.mingw	Sat Apr 09 17:12:07 2005 +0000
@@ -27,6 +27,8 @@
 SILC = $(GAIM_PROTOS)/silc
 PO = ./po
 
+MAKENSIS := makensis.exe
+
 VERSION := $(shell cat ./VERSION)
 
 NEEDED_DLLS =		$(GTKSPELL_TOP)/libgtkspell.dll \
@@ -91,13 +93,13 @@
 	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
 
diff -r 3595f818ee37 -r 6dcfec6f2f7c plugins/perl/Makefile.mingw
--- a/plugins/perl/Makefile.mingw	Sat Apr 09 16:36:11 2005 +0000
+++ b/plugins/perl/Makefile.mingw	Sat Apr 09 17:12:07 2005 +0000
@@ -21,7 +21,7 @@
 
 TARGET = perl
 
-CC = gcc.exe
+CC := gcc.exe
 
 # Compiler Options
 
diff -r 3595f818ee37 -r 6dcfec6f2f7c plugins/perl/common/Makefile.mingw
--- a/plugins/perl/common/Makefile.mingw	Sat Apr 09 16:36:11 2005 +0000
+++ b/plugins/perl/common/Makefile.mingw	Sat Apr 09 17:12:07 2005 +0000
@@ -11,8 +11,8 @@
 ## TOOLS
 ##
 
-CC = gcc
-PERL = /cygdrive/c/perl/bin/perl
+CC := gcc
+PERL := /cygdrive/c/perl/bin/perl
 
 ##
 ## PATHS
diff -r 3595f818ee37 -r 6dcfec6f2f7c po/Makefile.mingw
--- a/po/Makefile.mingw	Sat Apr 09 16:36:11 2005 +0000
+++ b/po/Makefile.mingw	Sat Apr 09 17:12:07 2005 +0000
@@ -19,7 +19,7 @@
 ## TOOLS
 ##
 
-GMSGFMT = $(GTK_BIN)/msgfmt
+GMSGFMT := $(GTK_BIN)/msgfmt
 
 
 .SUFFIXES:
diff -r 3595f818ee37 -r 6dcfec6f2f7c src/Makefile.mingw
--- a/src/Makefile.mingw	Sat Apr 09 16:36:11 2005 +0000
+++ b/src/Makefile.mingw	Sat Apr 09 17:12:07 2005 +0000
@@ -37,6 +37,8 @@
 #-mconsole
 #-mwindows
 
+WINDRES := windres
+
 ##
 ## INCLUDE  MAKEFILES
 ##
@@ -194,7 +196,7 @@
 
 # How to make an RC file
 %.o: %.rc
-	windres -i $< -o $@
+	$(WINDRES) -i $< -o $@
 
 ##
 ## TARGET DEFINITIONS