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

[svn_grass at osgeo.org]

Author: hellik
Date: 2014-09-11 14:28:09 -0700 (Thu, 11 Sep 2014)
New Revision: 61865

Modified:
   grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi.tmpl
Log:
nsis: $INSTDIR -> $INSTALL_DIR (work in progress)

Modified: grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi.tmpl
===================================================================
--- grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi.tmpl	2014-09-11 21:27:23 UTC (rev 61864)
+++ grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi.tmpl	2014-09-11 21:28:09 UTC (rev 61865)
@@ -922,7 +922,7 @@
 	ExecWait '"$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist_2005_x86.exe" /q'
 	ExecWait '"$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist_2008_x86.exe" /q'	
 	ExecWait '"$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist_2010_x86.exe" /q'
-	CopyFiles "$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\*.dll" "$INSTDIR\extrabin"
+	CopyFiles "$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\*.dll" "$INSTALL_DIR\extrabin"
 	Delete "$TEMP\$ARCHIVE_NAME"
 	RMDir /r "$TEMP\$ORIGINAL_UNTAR_FOLDER"
 	;the following doesn't work. Maybe because the installer is still running?