[GRASS-SVN] r57521 - in grass/branches/develbranch_6/mswindows: . osgeo4w

[svn_grass at osgeo.org]

Author: martinl
Date: 2013-08-28 00:58:24 -0700 (Wed, 28 Aug 2013)
New Revision: 57521

Modified:
   grass/branches/develbranch_6/mswindows/env.bat
   grass/branches/develbranch_6/mswindows/osgeo4w/env.bat.tmpl
Log:
wingrass: fix PROJ_LIB (osgeo4w), cosmetics

Modified: grass/branches/develbranch_6/mswindows/env.bat
===================================================================
--- grass/branches/develbranch_6/mswindows/env.bat	2013-08-28 07:46:09 UTC (rev 57520)
+++ grass/branches/develbranch_6/mswindows/env.bat	2013-08-28 07:58:24 UTC (rev 57521)
@@ -1,4 +1,6 @@
+rem
 rem Environmental variables for GRASS stand-alone installer
+rem
 
 set GRASS_WISH=%GISBASE%\extrabin\wish.exe
 set GRASS_SH=%GISBASE%\msys\bin\sh.exe

Modified: grass/branches/develbranch_6/mswindows/osgeo4w/env.bat.tmpl
===================================================================
--- grass/branches/develbranch_6/mswindows/osgeo4w/env.bat.tmpl	2013-08-28 07:46:09 UTC (rev 57520)
+++ grass/branches/develbranch_6/mswindows/osgeo4w/env.bat.tmpl	2013-08-28 07:58:24 UTC (rev 57521)
@@ -1,16 +1,21 @@
+rem
 rem Environmental variables for GRASS OSGeo4W installer
+rem
 
 set GISBASE=%OSGEO4W_ROOT%\apps\grass\grass- at VERSION@
+set GRASS_SH=%OSGEO4W_ROOT%\apps\msys\bin\sh.exe
 
-set GRASS_SH=%OSGEO4W_ROOT%\apps\msys\bin\sh.exe
+set GRASS_HTML_BROWSER=explorer
+
+set GRASS_PYTHON=%OSGEO4W_ROOT%\bin\python.exe
+set PYTHONHOME=%OSGEO4W_ROOT%\apps\Python27
+
 set GRASS_WISH=%OSGEO4W_ROOT%\bin\wish.exe
-set GRASS_PYTHON=python
+
 set GRASS_PROJSHARE=%OSGEO4W_ROOT%\share\proj
-set GRASS_HTML_BROWSER=explorer
 
-set PYTHONHOME=%OSGEO4W_ROOT%\apps\Python27
+set PROJ_LIB=%OSGEO4W_ROOT%\share\proj
 set GDAL_DATA=%OSGEO4W_ROOT%\share\gdal
-set PROJ_LIB=%OSGEO4W_ROOT%\proj
 set GEOTIFF_CSV=%OSGEO4W_ROOT%\share\epsg_csv
 
 set PATH=%GISBASE%\bin;%OSGEO4W_ROOT%\apps\msys\bin;%PATH%