pidgin.2.x.y: b5197623: makensis on Windows now accepts - or / a..

[datallah at pidgin.im]

----------------------------------------------------------------------
Revision: b519762318ffa47d688c4bcfc847b5a38a7a5f2a
Parent:   6807c4c5a28536e02d64363122b925c53fb03f34
Author:   datallah at pidgin.im
Date:     02/28/12 17:41:57
Branch:   im.pidgin.pidgin.2.x.y
URL: http://d.pidgin.im/viewmtn/revision/info/b519762318ffa47d688c4bcfc847b5a38a7a5f2a

Changelog: 

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

Changes against parent 6807c4c5a28536e02d64363122b925c53fb03f34

  patched  Makefile.mingw
  patched  libpurple/win32/global.mak

-------------- next part --------------
============================================================
--- Makefile.mingw	278b7927f9db6f3ca164fc359d0670cab097d1bb
+++ Makefile.mingw	8c63eb52b1aa5ac7b099b8ae814948b5a02c0c03
@@ -139,11 +139,11 @@ installer: generate_installer_includes
 	 -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
============================================================
--- libpurple/win32/global.mak	ac8976b86788f9b1e5f54b90334769367e04dd5a
+++ libpurple/win32/global.mak	af4b8b87e3877e05edfc490a0cd672c7589d2639
@@ -102,7 +102,6 @@ MAKENSIS ?= makensis.exe
 endif
 GMSGFMT ?= $(WIN32_DEV_TOP)/gettext-0.17/bin/msgfmt
 MAKENSIS ?= makensis.exe
-MAKENSISOPT ?= /
 PERL ?= perl
 WINDRES ?= windres
 STRIP ?= strip