--- /home/despres/src/CMake/Modules/NSIS.template.in	2008-10-23 08:49:10.453125000 +0200
+++ /home/despres/install/cmake-cvs/share/cmake-2.7/Modules/NSIS.template.in	2008-10-23 09:38:31.968750000 +0200
@@ -25,7 +25,7 @@
   !include "MUI.nsh"
 
   ;Default installation folder
-  InstallDir "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@"  
+  InstallDir "$PROGRAMFILES\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
 
 ;--------------------------------
 ;General
@@ -804,6 +804,15 @@
 
   ;Remove the installation directory if it is empty.
   RMDir "$INSTDIR"
+  ;FIXME: Only one level of install directory is removed.
+  ; When INSTDIR is like C:\Program Files\foo\bar\Vendor\My App
+  ; and foo\bar\Vendor\My App are created by the installer only My App will be
+  ; removed even if the others are empty.
+  ; We should have something like (but generic):
+  ;  RMDir C:\Program Files\foo\bar\Vendor\My App
+  ;  RMDir C:\Program Files\foo\bar\Vendor
+  ;  RMDir C:\Program Files\foo\bar\
+  ;  RMDir C:\Program Files\foo\
 
   ; Remove the registry entries.
   DeleteRegKey SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
@@ -872,7 +881,7 @@
   !insertmacro SectionList "InitSection"
 
   StrCpy $SV_ALLUSERS "JustMe"
-  StrCpy $INSTDIR "$DOCUMENTS\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
+  StrCpy $INSTDIR "$DOCUMENTS\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
 
   ClearErrors
   UserInfo::GetName
@@ -897,7 +906,7 @@
 
   done:
   StrCmp $SV_ALLUSERS "AllUsers" 0 +2
-    StrCpy $INSTDIR "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
+    StrCpy $INSTDIR "$PROGRAMFILES\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
 
   StrCmp "@CPACK_NSIS_MODIFY_PATH@" "ON" 0 noOptionsPage
     !insertmacro MUI_INSTALLOPTIONS_EXTRACT "NSIS.InstallOptions.ini"