[GRASS-SVN] r74034 - grass/branches/releasebranch_7_6/mswindows/osgeo4w

[svn_grass at osgeo.org]

Author: martinl
Date: 2019-01-28 01:38:37 -0800 (Mon, 28 Jan 2019)
New Revision: 74034

Modified:
   grass/branches/releasebranch_7_6/mswindows/osgeo4w/grass.bat.tmpl
Log:
wrong OSGEO4W_ROOT when installing OSGeo4W to different target directory, see #3724 (g76: merge r74020 from trunk)

Modified: grass/branches/releasebranch_7_6/mswindows/osgeo4w/grass.bat.tmpl
===================================================================
--- grass/branches/releasebranch_7_6/mswindows/osgeo4w/grass.bat.tmpl	2019-01-28 05:02:00 UTC (rev 74033)
+++ grass/branches/releasebranch_7_6/mswindows/osgeo4w/grass.bat.tmpl	2019-01-28 09:38:37 UTC (rev 74034)
@@ -5,12 +5,13 @@
 rem #
 rem #########################################################################
 
-SET OSGEO4W_ROOT=@OSGEO4W_ROOT@
-
 rem
 rem Set environmental variables
 rem
-call %OSGEO4W_ROOT%\bin\o4w_env.bat
+call "%~dp0\o4w_env.bat"
+call py3_env.bat
+ at echo off
+
 call %OSGEO4W_ROOT%\apps\grass\grass- at VERSION@\etc\env.bat
 
 rem