# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1330468917 0
# Node ID 200a6032d8ecec55b1b154063c216a9f0b16dec2
# Parent  bba25395d28ea8eb21fc636368ae02a9dc9a82f5
makensis on Windows now accepts - or / as an argument prefix (since 2.25).
This means that we can just use - directly and not make it configurable.
This will alleviate issues for people using the MSYS shell.
Thanks to renatosilva for this.

Fixes #14960

diff -r bba25395d28e -r 200a6032d8ec Makefile.mingw
--- a/Makefile.mingw	Mon Feb 27 23:08:37 2012 +0000
+++ b/Makefile.mingw	Tue Feb 28 22:41:57 2012 +0000
@@ -139,11 +139,11 @@
 	 -exec $(STRIP) --strip-unneeded {} ';'
 
 installer: generate_installer_includes
-	$(MAKENSIS) $(MAKENSISOPT)V3 $(MAKENSISOPT)DPIDGIN_VERSION="$(PIDGIN_VERSION)" $(MAKENSISOPT)DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" $(MAKENSISOPT)DPIDGIN_INSTALL_DIR="$(STRIPPED_RELEASE_DIR)" $(MAKENSISOPT)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="$(STRIPPED_RELEASE_DIR)" -DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
 	mv pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION).exe ./
 
 installer_offline: generate_installer_includes
-	$(MAKENSIS) $(MAKENSISOPT)V3 $(MAKENSISOPT)DPIDGIN_VERSION="$(PIDGIN_VERSION)" $(MAKENSISOPT)DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" $(MAKENSISOPT)DOFFLINE_INSTALLER $(MAKENSISOPT)DPIDGIN_INSTALL_DIR="$(STRIPPED_RELEASE_DIR)" $(MAKENSISOPT)DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
+	$(MAKENSIS) -V3 -DPIDGIN_VERSION="$(PIDGIN_VERSION)" -DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" -DOFFLINE_INSTALLER -DPIDGIN_INSTALL_DIR="$(STRIPPED_RELEASE_DIR)" -DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
 	mv pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION)-offline.exe ./
 
 installer_zip: create_release_install_dir
diff -r bba25395d28e -r 200a6032d8ec libpurple/win32/global.mak
--- a/libpurple/win32/global.mak	Mon Feb 27 23:08:37 2012 +0000
+++ b/libpurple/win32/global.mak	Tue Feb 28 22:41:57 2012 +0000
@@ -102,7 +102,6 @@
 endif
 GMSGFMT ?= $(WIN32_DEV_TOP)/gettext-0.17/bin/msgfmt
 MAKENSIS ?= makensis.exe
-MAKENSISOPT ?= /
 PERL ?= perl
 WINDRES ?= windres
 STRIP ?= strip