[GRASS-SVN] r40437 - grass/branches/releasebranch_6_4/mswindows

[svn_grass at osgeo.org]

Author: hamish
Date: 2010-01-13 23:38:41 -0500 (Wed, 13 Jan 2010)
New Revision: 40437

Modified:
   grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi
Log:
set GRASS_PYTHON if it isn't (trac #534; merge from devbr6)

Modified: grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi	2010-01-14 04:35:41 UTC (rev 40436)
+++ grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi	2010-01-14 04:38:41 UTC (rev 40437)
@@ -569,8 +569,9 @@
 	FileWrite $0 'rem Path to the proj files (notably the epsg projection list)$\r$\n'	
 	FileWrite $0 'set GRASS_PROJSHARE=%GRASSDIR%\proj$\r$\n'
 	FileWrite $0 '$\r$\n'
-	FileWrite $0 'rem Path to the python directory$\r$\n'	
+	FileWrite $0 'rem Path to the python directory$\r$\n'
 	FileWrite $0 'set PYTHONHOME=%GRASSDIR%\Python25$\r$\n'
+	FileWrite $0 'if "x%GRASS_PYTHON%" == "x" set GRASS_PYTHON=python\r$\n'
 	FileWrite $0 '$\r$\n'
 	FileWrite $0 'set WINGISBASE=%GRASSDIR%$\r$\n'
 	FileWrite $0 '"%WINGISBASE%\etc\Init.bat" %*'
@@ -670,6 +671,9 @@
 	FileWrite $0 'export PYTHONPATH$\r$\n'
 	FileWrite $0 'PYTHONHOME="$INSTALL_DIR\Python25"$\r$\n'
 	FileWrite $0 'export PYTHONHOME$\r$\n'
+	FileWrite $0 'if [ -z "$$GRASS_PYTHON" ] ; then\r$\n'
+	FileWrite $0 '   GRASS_PYTHON=python; export GRASS_PYTHON\r$\n'
+	FileWrite $0 'fi\r$\n'
 	FileWrite $0 '$\r$\n'
 	FileWrite $0 '# Set the GRASS_PROJSHARE variable$\r$\n'
 	FileWrite $0 'GRASS_PROJSHARE="$INSTALL_DIR\proj"$\r$\n'