[GRASS-SVN] r61715 - in grass/trunk: include/Make scripts

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-08-22 06:18:43 -0700 (Fri, 22 Aug 2014)
New Revision: 61715

Modified:
   grass/trunk/include/Make/Script.make
   grass/trunk/scripts/windows_launch.bat
Log:
winGRASS: fix bat wrapper generation for addons (patch provided by glynn, see #2150)

Modified: grass/trunk/include/Make/Script.make
===================================================================
--- grass/trunk/include/Make/Script.make	2014-08-22 13:08:07 UTC (rev 61714)
+++ grass/trunk/include/Make/Script.make	2014-08-22 13:18:43 UTC (rev 61715)
@@ -20,12 +20,13 @@
 SCRIPT_ACTIONS = $(SCRIPT) $(ETCPYFILES) $(ETCPYCFILES) html scriptstrings
 ifdef MINGW
 SCRIPT_ACTIONS += $(BIN)/$(PGM).bat
+SCRIPT_DIR = %GISBASE%/scripts
 endif
 
 script: $(SCRIPT_ACTIONS)
 
 $(BIN)/$(PGM).bat: $(MODULE_TOPDIR)/scripts/windows_launch.bat
-	sed -e "s#SCRIPT_NAME#$(PGM)#" $(MODULE_TOPDIR)/scripts/windows_launch.bat > $@
+	sed -e "s#SCRIPT_NAME#$(PGM)#" -e "s#SCRIPT_DIR#$(SCRIPT_DIR)#" $(MODULE_TOPDIR)/scripts/windows_launch.bat > $@
 	unix2dos $@
 
 scriptstrings: $(STRINGDIR)/$(PGM)_to_translate.c

Modified: grass/trunk/scripts/windows_launch.bat
===================================================================
--- grass/trunk/scripts/windows_launch.bat	2014-08-22 13:08:07 UTC (rev 61714)
+++ grass/trunk/scripts/windows_launch.bat	2014-08-22 13:18:43 UTC (rev 61715)
@@ -1 +1 @@
-@"%GRASS_PYTHON%" "%GISBASE%/scripts/SCRIPT_NAME.py" %*
+@"%GRASS_PYTHON%" "SCRIPT_DIR/SCRIPT_NAME.py" %*