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

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-12-15 02:19:48 -0800 (Tue, 15 Dec 2015)
New Revision: 67139

Modified:
   grass/trunk/mswindows/GRASS-Installer.nsi.tmpl
Log:
winGRASS installer: fix instalation dir (32bit vs 64bit)

Modified: grass/trunk/mswindows/GRASS-Installer.nsi.tmpl
===================================================================
--- grass/trunk/mswindows/GRASS-Installer.nsi.tmpl	2015-12-15 10:04:39 UTC (rev 67138)
+++ grass/trunk/mswindows/GRASS-Installer.nsi.tmpl	2015-12-15 10:19:48 UTC (rev 67139)
@@ -38,14 +38,18 @@
 
 ;----------------------------------------------------------------------------------------------------------------------------
 
-;Platform (and GRASS Icon)
+;Define Platform and installation folder
 
+;----------------------------------------------------------------------------------------------------------------------------
+
 !if "@ARCH@" == "x86_64-w64-mingw32"
     !define PLATFORM "x86_64"
     !define GRASS_ICON "${INSTALL_DIR}\gui\icons\grass64bit.ico"
+    InstallDir "$PROGRAMFILES64\${GRASS_BASE}"
 !else
     !define PLATFORM "x86"
     !define GRASS_ICON "${INSTALL_DIR}\gui\icons\grass.ico"
+    InstallDir "$PROGRAMFILES32\${GRASS_BASE}"
 !endif
 
 ;----------------------------------------------------------------------------------------------------------------------------
@@ -97,9 +101,6 @@
 ;Name of the output file (installer executable)
 OutFile "${INSTALLER_NAME}"
 
-;Define installation folder
-InstallDir "$PROGRAMFILES\${GRASS_BASE}"
-
 ;Request application privileges for Windows
 RequestExecutionLevel admin