From 3e4b7a794b7819376a4f252940608e148898f9da Mon Sep 17 00:00:00 2001
From: timlinux <timlinux@c8812cc2-4d05-0410-92ff-de0c093fc19c>
Date: Wed, 29 Nov 2006 12:25:28 +0000
Subject: [PATCH] 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
---
 win_build/qgis-debug.nsi | 10 +++++-----
 win_build/qgis.nsi       |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/win_build/qgis-debug.nsi b/win_build/qgis-debug.nsi
index a9555ff2308..6be6bf70380 100644
--- a/win_build/qgis-debug.nsi
+++ b/win_build/qgis-debug.nsi
@@ -35,7 +35,7 @@ SetCompressor zlib
 ; Start menu page
 var ICONS_GROUP
 !define MUI_STARTMENUPAGE_NODISABLE
-!define MUI_STARTMENUPAGE_DEFAULTFOLDER "Quantum GIS Debug"
+!define MUI_STARTMENUPAGE_DEFAULTFOLDER "QuantumGISDebug"
 !define MUI_STARTMENUPAGE_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}"
 !define MUI_STARTMENUPAGE_REGISTRY_KEY "${PRODUCT_UNINST_KEY}"
 !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${PRODUCT_STARTMENU_REGVAL}"
@@ -79,7 +79,7 @@ FunctionEnd
 
 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
 OutFile "qgis_debug_setup.exe"
-InstallDir "$PROGRAMFILES\Quantum GIS Debug"
+InstallDir "$PROGRAMFILES\QuantumGISDebug"
 InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
 ShowInstDetails show
 ShowUnInstDetails show
@@ -187,10 +187,10 @@ Section Uninstall
   RMDir /r "$INSTDIR/nad"
   RMDir /r "$INSTDIR/msys"
 ;----------------- icons and shortcuts
-  Delete "$SMPROGRAMS\$ICONS_GROUP\Uninstall.lnk"
+  Delete "$SMPROGRAMS\$ICONS_GROUP\UninstallDebug.lnk"
   Delete "$SMPROGRAMS\$ICONS_GROUP\Website.lnk"
-  Delete "$DESKTOP\Quantum GIS.lnk"
-  Delete "$SMPROGRAMS\$ICONS_GROUP\Quantum GIS.lnk"
+  Delete "$DESKTOP\Quantum GIS Debug.lnk"
+  Delete "$SMPROGRAMS\$ICONS_GROUP\Quantum GIS Debug.lnk"
   RMDir "$SMPROGRAMS\$ICONS_GROUP"
 
   ;RMDir "$INSTDIR\plugins"
diff --git a/win_build/qgis.nsi b/win_build/qgis.nsi
index 571e0c193b2..07d95debb15 100644
--- a/win_build/qgis.nsi
+++ b/win_build/qgis.nsi
@@ -35,7 +35,7 @@ SetCompressor zlib
 ; Start menu page
 var ICONS_GROUP
 !define MUI_STARTMENUPAGE_NODISABLE
-!define MUI_STARTMENUPAGE_DEFAULTFOLDER "Quantum GIS"
+!define MUI_STARTMENUPAGE_DEFAULTFOLDER "QuantumGIS"
 !define MUI_STARTMENUPAGE_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}"
 !define MUI_STARTMENUPAGE_REGISTRY_KEY "${PRODUCT_UNINST_KEY}"
 !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${PRODUCT_STARTMENU_REGVAL}"
@@ -78,7 +78,7 @@ FunctionEnd
 
 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
 OutFile "qgis_setup.exe"
-InstallDir "$PROGRAMFILES\Quantum GIS"
+InstallDir "$PROGRAMFILES\QuantumGIS"
 InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
 ShowInstDetails show
 ShowUnInstDetails show