[GRASS-SVN] r67133 - grass/trunk/mswindows

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-12-14 13:13:36 -0800 (Mon, 14 Dec 2015)
New Revision: 67133

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

Modified: grass/trunk/mswindows/GRASS-Installer.nsi.tmpl
===================================================================
--- grass/trunk/mswindows/GRASS-Installer.nsi.tmpl	2015-12-14 21:06:41 UTC (rev 67132)
+++ grass/trunk/mswindows/GRASS-Installer.nsi.tmpl	2015-12-14 21:13:36 UTC (rev 67133)
@@ -36,9 +36,12 @@
         !define GRASS_COMMAND "grass at GRASS_VERSION_MAJOR@@GRASS_VERSION_MINOR at svn"
 !endif
 
-; Platform and GRASS Icon
-!if "%1" == "64"
-    !define PLATFORM   "x86_64"
+;----------------------------------------------------------------------------------------------------------------------------
+
+;Platform (and GRASS Icon)
+
+!if "@ARCH@" == "x86_64-w64-mingw32"
+    !define PLATFORM "x86_64"
     !define GRASS_ICON "${INSTALL_DIR}\gui\icons\grass64bit.ico"
 !else
     !define PLATFORM "x86"

Modified: grass/trunk/mswindows/Makefile
===================================================================
--- grass/trunk/mswindows/Makefile	2015-12-14 21:06:41 UTC (rev 67132)
+++ grass/trunk/mswindows/Makefile	2015-12-14 21:13:36 UTC (rev 67133)
@@ -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)#' \
 	$< > $@