Merge pull request #2 from timlinux/master.

Some minor updates to documentation and added shortname to the quickpackage script
qgis · May 4, 2011 · 730b651 · 730b651
2 parents 0e17f4e + 0b7f5fa
commit 730b651
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/doc/msvc.t2t b/doc/msvc.t2t
@@ -86,8 +86,8 @@ set OSGEO4W_ROOT=C:\OSGeo4W
 call "%OSGEO4W_ROOT%\bin\o4w_env.bat"
 
 @set GRASS_PREFIX=c:/OSGeo4W/apps/grass/grass-6.4.0
-@set INCLUDE=%INCLUDE%;%OSGEO4W_ROOT%\apps\gdal-17\include;%OSGEO4W_ROOT%\include
-@set LIB=%LIB%;%OSGEO4W_ROOT%\apps\gdal-17\lib;%OSGEO4W_ROOT%\lib
+@set INCLUDE=%INCLUDE%;%OSGEO4W_ROOT%\include
+@set LIB=%LIB%;%OSGEO4W_ROOT%\lib;%OSGEO4W_ROOT%\lib
 
 @cmd
 ```

diff --git a/ms-windows/quickpackage.sh b/ms-windows/quickpackage.sh
@@ -21,4 +21,5 @@ makensis \
 -DBINARY_REVISION=1 \
 -DINSTALLER_TYPE=OSGeo4W \
 -DPACKAGE_FOLDER=osgeo4w/unpacked \
+-DSHORTNAME=qgis \
 QGIS-Installer.nsi