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

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-04-28 09:09:07 -0700 (Thu, 28 Apr 2011)
New Revision: 46131

Modified:
   grass/trunk/mswindows/osgeo4w/grass.bat.tmpl
   grass/trunk/mswindows/osgeo4w/package.sh
Log:
fix generating grass.bat for osgeo4w

Modified: grass/trunk/mswindows/osgeo4w/grass.bat.tmpl
===================================================================
--- grass/trunk/mswindows/osgeo4w/grass.bat.tmpl	2011-04-28 15:30:45 UTC (rev 46130)
+++ grass/trunk/mswindows/osgeo4w/grass.bat.tmpl	2011-04-28 16:09:07 UTC (rev 46131)
@@ -2,4 +2,4 @@
 SET OSGEO4W_ROOT=@osgeo4w@
 call %OSGEO4W_ROOT%\bin\o4w_env.bat
 call %OSGEO4W_ROOT%\apps\grass\grass- at VERSION@\etc\env.bat
-call %GRASS_PYTHON% @OSGEO4W_ROOT@\bin\grass at POSTFIX@.py
+call %GRASS_PYTHON% %OSGEO4W_ROOT%\bin\grass at POSTFIX@.py

Modified: grass/trunk/mswindows/osgeo4w/package.sh
===================================================================
--- grass/trunk/mswindows/osgeo4w/package.sh	2011-04-28 15:30:45 UTC (rev 46130)
+++ grass/trunk/mswindows/osgeo4w/package.sh	2011-04-28 16:09:07 UTC (rev 46131)
@@ -134,7 +134,7 @@
     $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/include/grass/config.h.mingw
 cp mswindows/osgeo4w/config.h.switch $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/include/grass/config.h
 cp mswindows/osgeo4w/config.h.vc $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/include/grass
-sed -e "s#@VERSION@#$VERSION#g" -e "s#@osgeo4w@#$OSGEO4W_ROOT#g" \
+sed -e "s#@VERSION@#$VERSION#g" -e "s#@osgeo4w@#$OSGEO4W_ROOT#g" -e "s#@POSTFIX@#$MAJOR$MINOR#g" \
     mswindows/osgeo4w/grass.bat.tmpl >$OSGEO4W_ROOT_MSYS/bin/grass$MAJOR$MINOR.bat
 sed -e "s#@VERSION@#$VERSION#g" -e "s#@OSGEO4W_ROOT_MSYS@#$OSGEO4W_ROOT#g" \
     mswindows/osgeo4w/env.bat.tmpl >$OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/etc/env.bat