Skip to content

Commit 3e4b7a7

Browse files
author
timlinux
committed
Install qgis into <path>/QuantumGIS rather than <path>/Quantum GIS so that grass shell can work. Note user still needs to intall in a base dir with no spaces. i.e. installing into c:\Program Files\QuantumGIS will not allow shell to work as the path has spaces in it.
git-svn-id: http://svn.osgeo.org/qgis/trunk@6146 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 567ac64 commit 3e4b7a7

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

win_build/qgis-debug.nsi

+5-5
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ SetCompressor zlib
3535
; Start menu page
3636
var ICONS_GROUP
3737
!define MUI_STARTMENUPAGE_NODISABLE
38-
!define MUI_STARTMENUPAGE_DEFAULTFOLDER "Quantum GIS Debug"
38+
!define MUI_STARTMENUPAGE_DEFAULTFOLDER "QuantumGISDebug"
3939
!define MUI_STARTMENUPAGE_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}"
4040
!define MUI_STARTMENUPAGE_REGISTRY_KEY "${PRODUCT_UNINST_KEY}"
4141
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${PRODUCT_STARTMENU_REGVAL}"
@@ -79,7 +79,7 @@ FunctionEnd
7979

8080
Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
8181
OutFile "qgis_debug_setup.exe"
82-
InstallDir "$PROGRAMFILES\Quantum GIS Debug"
82+
InstallDir "$PROGRAMFILES\QuantumGISDebug"
8383
InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
8484
ShowInstDetails show
8585
ShowUnInstDetails show
@@ -187,10 +187,10 @@ Section Uninstall
187187
RMDir /r "$INSTDIR/nad"
188188
RMDir /r "$INSTDIR/msys"
189189
;----------------- icons and shortcuts
190-
Delete "$SMPROGRAMS\$ICONS_GROUP\Uninstall.lnk"
190+
Delete "$SMPROGRAMS\$ICONS_GROUP\UninstallDebug.lnk"
191191
Delete "$SMPROGRAMS\$ICONS_GROUP\Website.lnk"
192-
Delete "$DESKTOP\Quantum GIS.lnk"
193-
Delete "$SMPROGRAMS\$ICONS_GROUP\Quantum GIS.lnk"
192+
Delete "$DESKTOP\Quantum GIS Debug.lnk"
193+
Delete "$SMPROGRAMS\$ICONS_GROUP\Quantum GIS Debug.lnk"
194194
RMDir "$SMPROGRAMS\$ICONS_GROUP"
195195

196196
;RMDir "$INSTDIR\plugins"

win_build/qgis.nsi

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ SetCompressor zlib
3535
; Start menu page
3636
var ICONS_GROUP
3737
!define MUI_STARTMENUPAGE_NODISABLE
38-
!define MUI_STARTMENUPAGE_DEFAULTFOLDER "Quantum GIS"
38+
!define MUI_STARTMENUPAGE_DEFAULTFOLDER "QuantumGIS"
3939
!define MUI_STARTMENUPAGE_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}"
4040
!define MUI_STARTMENUPAGE_REGISTRY_KEY "${PRODUCT_UNINST_KEY}"
4141
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${PRODUCT_STARTMENU_REGVAL}"
@@ -78,7 +78,7 @@ FunctionEnd
7878

7979
Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
8080
OutFile "qgis_setup.exe"
81-
InstallDir "$PROGRAMFILES\Quantum GIS"
81+
InstallDir "$PROGRAMFILES\QuantumGIS"
8282
InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
8383
ShowInstDetails show
8484
ShowUnInstDetails show

0 commit comments

Comments
 (0)