[GRASS-SVN] r74020 - grass/trunk/mswindows/osgeo4w

[svn_grass at osgeo.org]

Author: martinl
Date: 2019-01-26 03:11:58 -0800 (Sat, 26 Jan 2019)
New Revision: 74020

Modified:
   grass/trunk/mswindows/osgeo4w/grass.bat.tmpl
Log:
wrong OSGEO4W_ROOT when installing OSGeo4W to different target directory, see #3724

Modified: grass/trunk/mswindows/osgeo4w/grass.bat.tmpl
===================================================================
--- grass/trunk/mswindows/osgeo4w/grass.bat.tmpl	2019-01-26 05:10:16 UTC (rev 74019)
+++ grass/trunk/mswindows/osgeo4w/grass.bat.tmpl	2019-01-26 11:11:58 UTC (rev 74020)
@@ -5,13 +5,13 @@
 rem #
 rem #########################################################################
 
-SET OSGEO4W_ROOT=@OSGEO4W_ROOT@
-
 rem
 rem Set environmental variables
 rem
-call %OSGEO4W_ROOT%\bin\o4w_env.bat
-call %OSGEO4W_ROOT%\bin\py3_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