[GRASS-SVN] r57366 - grass/branches/develbranch_6/mswindows

[svn_grass at osgeo.org]

Author: martinl
Date: 2013-08-02 06:37:19 -0700 (Fri, 02 Aug 2013)
New Revision: 57366

Modified:
   grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi.tmpl
   grass/branches/develbranch_6/mswindows/env.bat
Log:
wingrass: restore PROJ_LIB variable (fix r57344)


Modified: grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi.tmpl
===================================================================
--- grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi.tmpl	2013-08-02 10:26:28 UTC (rev 57365)
+++ grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi.tmpl	2013-08-02 13:37:19 UTC (rev 57366)
@@ -806,6 +806,10 @@
 	FileWrite $0 'GRASS_PROJSHARE="$INSTALL_DIR\share\proj"$\r$\n'
 	FileWrite $0 'export GRASS_PROJSHARE$\r$\n'
 	FileWrite $0 '$\r$\n'
+	FileWrite $0 '# Set the PROJ_LIB variable$\r$\n'
+	FileWrite $0 'PROJ_LIB="$INSTALL_DIR\share\proj"$\r$\n'
+	FileWrite $0 'export PROJ_LIB $\r$\n'
+	FileWrite $0 '$\r$\n'
 	FileWrite $0 '# Set the GDAL_DATA variable$\r$\n'
 	FileWrite $0 'GDAL_DATA="$INSTALL_DIR\share\gdal"$\r$\n'
 	FileWrite $0 'export GDAL_DATA$\r$\n'

Modified: grass/branches/develbranch_6/mswindows/env.bat
===================================================================
--- grass/branches/develbranch_6/mswindows/env.bat	2013-08-02 10:26:28 UTC (rev 57365)
+++ grass/branches/develbranch_6/mswindows/env.bat	2013-08-02 13:37:19 UTC (rev 57366)
@@ -10,6 +10,8 @@
 set PYTHONHOME=%GISBASE%\Python27
 
 set GRASS_PROJSHARE=%GISBASE%\share\proj
+
+set PROJ_LIB=%GISBASE%\share\proj 
 set GDAL_DATA=%GISBASE%\share\gdal
 set GEOTIFF_CSV=%GISBASE%\share\epsg_csv