[GRASS-SVN] r67134 - grass/branches/releasebranch_7_0/mswindows

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-12-14 13:15:08 -0800 (Mon, 14 Dec 2015)
New Revision: 67134

Modified:
   grass/branches/releasebranch_7_0/mswindows/GRASS-Installer.nsi.tmpl
   grass/branches/releasebranch_7_0/mswindows/Makefile
Log:
wingrass installer: fix platform definition

Modified: grass/branches/releasebranch_7_0/mswindows/GRASS-Installer.nsi.tmpl
===================================================================
--- grass/branches/releasebranch_7_0/mswindows/GRASS-Installer.nsi.tmpl	2015-12-14 21:13:36 UTC (rev 67133)
+++ grass/branches/releasebranch_7_0/mswindows/GRASS-Installer.nsi.tmpl	2015-12-14 21:15:08 UTC (rev 67134)
@@ -36,8 +36,11 @@
         !define GRASS_COMMAND "grass at GRASS_VERSION_MAJOR@@GRASS_VERSION_MINOR at svn"
 !endif
 
-; Platform
-!if "%1" == "64"
+;----------------------------------------------------------------------------------------------------------------------------
+
+;Platform
+
+!if "@ARCH@" == "x86_64-w64-mingw32"
     !define PLATFORM "x86_64"
 !else
     !define PLATFORM "x86"

Modified: grass/branches/releasebranch_7_0/mswindows/Makefile
===================================================================
--- grass/branches/releasebranch_7_0/mswindows/Makefile	2015-12-14 21:13:36 UTC (rev 67133)
+++ grass/branches/releasebranch_7_0/mswindows/Makefile	2015-12-14 21:15:08 UTC (rev 67134)
@@ -23,4 +23,5 @@
 	-e 's#@GRASS_VERSION_MAJOR@#$(GRASS_VERSION_MAJOR)#' \
 	-e 's#@GRASS_VERSION_MINOR@#$(GRASS_VERSION_MINOR)#' \
 	-e 's#@GRASS_VERSION_RELEASE@#$(GRASS_VERSION_RELEASE)#' \
+	-e 's#@ARCH@#$(ARCH)#' \
 	$< > $@