瀏覽代碼

wingrass: Fix OSGEO4W_ROOT in grass.bat

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@72996 15284696-431f-4ddb-bdfa-cd5b030d7da7
Huidae Cho 6 年之前
父節點
當前提交
ed817c758a
共有 2 個文件被更改,包括 3 次插入2 次删除
  1. 1 1
      mswindows/osgeo4w/grass.bat.tmpl
  2. 2 1
      mswindows/osgeo4w/package.sh

+ 1 - 1
mswindows/osgeo4w/grass.bat.tmpl

@@ -5,7 +5,7 @@ rem # GRASS initialization bat script (OSGeo4W)
 rem #
 rem #########################################################################
 
-SET OSGEO4W_ROOT=@osgeo4w@
+SET OSGEO4W_ROOT=@OSGEO4W_ROOT@
 
 rem
 rem Set environmental variables

+ 2 - 1
mswindows/osgeo4w/package.sh

@@ -236,7 +236,8 @@ if [ -n "$PACKAGE_PATCH" ]; then
     cd $OSGEO4W_ROOT_MSYS 
 
     # update startup script
-    sed -e "s#@VERSION@#$VERSION#g" -e "s#@POSTFIX@#$MAJOR$MINOR#g" \
+    sed -e "s#@VERSION@#$VERSION#g" -e "s#@OSGEO4W_ROOT@#$OSGEO4W_ROOT#g" \
+	-e "s#@POSTFIX@#$MAJOR$MINOR#g" \
 	$SRC/mswindows/osgeo4w/grass.bat.tmpl > bin/${GRASS_EXECUTABLE}.bat.tmpl
     
     # bat files - unix2dos