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

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-02-09 02:28:49 -0800 (Thu, 09 Feb 2012)
New Revision: 50740

Modified:
   grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi
   grass/branches/develbranch_6/mswindows/osgeo4w/package.sh
Log:
winGRASS: reflect recent changes in osgeo4w framework (msys-dev)

Modified: grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi
===================================================================
--- grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi	2012-02-09 10:28:30 UTC (rev 50739)
+++ grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi	2012-02-09 10:28:49 UTC (rev 50740)
@@ -481,7 +481,7 @@
 	FileWrite $0 'set GISBASE=$INSTALL_DIR$\r$\n'
 	FileWrite $0 '$\r$\n'
 	FileWrite $0 'rem set path to freetype dll$\r$\n'
-	FileWrite $0 'set FREETYPEBASE=$INSTALL_DIR\extralib;$INSTALL_DIR\lib$\r$\n'
+	FileWrite $0 'set FREETYPEBASE=$INSTALL_DIR\extralib;$INSTALL_DIR\msys\bin;$INSTALL_DIR\lib$\r$\n'
 	FileWrite $0 '$\r$\n'
 	FileWrite $0 'rem set dependecies path$\r$\n'
 	FileWrite $0 'set PATH=%FREETYPEBASE%;%PATH%$\r$\n'

Modified: grass/branches/develbranch_6/mswindows/osgeo4w/package.sh
===================================================================
--- grass/branches/develbranch_6/mswindows/osgeo4w/package.sh	2012-02-09 10:28:30 UTC (rev 50739)
+++ grass/branches/develbranch_6/mswindows/osgeo4w/package.sh	2012-02-09 10:28:49 UTC (rev 50740)
@@ -182,9 +182,6 @@
 	apps/grass/grass-$VERSION \
 	bin/${GRASS_EXECUTABLE}.bat.tmpl \
 	bin/${GRASS_EXECUTABLE}.tmpl \
-	bin/libintl3.dll \
-	bin/libiconv2.dll \
-	bin/regex2.dll \
 	etc/postinstall/${GRASS_EXECUTABLE}.bat \
 	etc/preremove/${GRASS_EXECUTABLE}.bat