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

[svn_grass at osgeo.org]

Author: hamish
Date: 2010-09-22 02:10:52 +0000 (Wed, 22 Sep 2010)
New Revision: 43603

Modified:
   grass/trunk/mswindows/GRASS-Installer.nsi
Log:
Helmut: set set PROJ_LIB and GDAL_DATA for proj4/cs2cs in windows (bug #1165, merge r43520 and r43542 from devbr6)

Modified: grass/trunk/mswindows/GRASS-Installer.nsi
===================================================================
--- grass/trunk/mswindows/GRASS-Installer.nsi	2010-09-22 01:57:31 UTC (rev 43602)
+++ grass/trunk/mswindows/GRASS-Installer.nsi	2010-09-22 02:10:52 UTC (rev 43603)
@@ -738,6 +738,12 @@
 	FileWrite $0 'rem Path to the proj files (notably the epsg projection list)$\r$\n'	
 	FileWrite $0 'set GRASS_PROJSHARE=%GISBASE%\proj$\r$\n'
 	FileWrite $0 '$\r$\n'
+	FileWrite $0 'rem Set GDAL_DATA$\r$\n'	
+	FileWrite $0 'set GDAL_DATA=%GISBASE%\etc\ogr_csv$\r$\n'
+	FileWrite $0 '$\r$\n'
+	FileWrite $0 'rem Set PROJ_LIB$\r$\n'	
+	FileWrite $0 'set PROJ_LIB=%GISBASE%\proj$\r$\n'
+	FileWrite $0 '$\r$\n'
 	FileWrite $0 'rem Path to the python directory$\r$\n'
 	FileWrite $0 'set PYTHONHOME=%GISBASE%\Python25$\r$\n'
 	FileWrite $0 'if "x%GRASS_PYTHON%" == "x" set GRASS_PYTHON=python$\r$\n'
@@ -867,6 +873,14 @@
 	FileWrite $0 'GRASS_PROJSHARE="$INSTALL_DIR\proj"$\r$\n'
 	FileWrite $0 'export GRASS_PROJSHARE$\r$\n'
 	FileWrite $0 '$\r$\n'
+	FileWrite $0 '# Set the GDAL_DATA variable$\r$\n'
+	FileWrite $0 'GDAL_DATA="$INSTALL_DIR\etc\ogr_csv"$\r$\n'
+	FileWrite $0 'export GDAL_DATA$\r$\n'
+	FileWrite $0 '$\r$\n'
+	FileWrite $0 '# Set the PROJ_LIB variable$\r$\n'
+	FileWrite $0 'PROJ_LIB="$INSTALL_DIR\proj"$\r$\n'
+	FileWrite $0 'export PROJ_LIB $\r$\n'
+	FileWrite $0 '$\r$\n'
 	FileWrite $0 '"$$GRASS_PYTHON $$GISBASE/grass70.py" "$$@"'
 	FileClose $0
 	done_create_grass_command: