Avoid removing dir in awstats

diff --git a/make/exe/awstats.nsi b/make/exe/awstats.nsi
index 9d4cd952ca549d43dea8a42a8f0f8ef2ad6bb7f1..b3ced7396b1d3a8b1abee7e35cd4cdb98d1b07c7 100644 (file)
--- a/make/exe/awstats.nsi
+++ b/make/exe/awstats.nsi
@@ -38,35 +38,35 @@
 
 
 
-;--------------------------------\r
-;Interface Settings\r
-\r
-  !define MUI_ABORTWARNING\r
-\r
+;--------------------------------
+;Interface Settings
+
+  !define MUI_ABORTWARNING
 
-;--------------------------------\r
-;Language Selection Dialog Settings\r
 
-  ;Recupere la langue choisie pour la dernière installation\r
-  !define MUI_LANGDLL_REGISTRY_ROOT "HKCU" \r
-  !define MUI_LANGDLL_REGISTRY_KEY "Software\${MUI_PROD}" \r
-  !define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"\r
+;--------------------------------
+;Language Selection Dialog Settings
 
+  ;Recupere la langue choisie pour la dernière installation
+  !define MUI_LANGDLL_REGISTRY_ROOT "HKCU" 
+  !define MUI_LANGDLL_REGISTRY_KEY "Software\${MUI_PROD}" 
+  !define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
 
-;--------------------------------\r
-;Pages\r
+
+;--------------------------------
+;Pages
 
   !define MUI_SPECIALBITMAP "C:\Mes Developpements\awstats\make\exe\awstats_bitmap1.bmp"
   !define MUI_HEADERBITMAP "C:\Mes Developpements\awstats\make\exe\awstats_bitmap2.bmp"
 
-  !insertmacro MUI_PAGE_WELCOME\r
-  !insertmacro MUI_PAGE_LICENSE "C:\temp\awstats-buildroot\awstats-${MUI_VERSION_DOT}\docs\LICENSE.TXT"\r
-;  !insertmacro MUI_PAGE_COMPONENTS\r
-  !insertmacro MUI_PAGE_DIRECTORY\r
-  !insertmacro MUI_PAGE_INSTFILES\r
-  \r
-  !insertmacro MUI_UNPAGE_CONFIRM\r
-  !insertmacro MUI_UNPAGE_INSTFILES\r
+  !insertmacro MUI_PAGE_WELCOME
+  !insertmacro MUI_PAGE_LICENSE "C:\temp\awstats-buildroot\awstats-${MUI_VERSION_DOT}\docs\LICENSE.TXT"
+;  !insertmacro MUI_PAGE_COMPONENTS
+  !insertmacro MUI_PAGE_DIRECTORY
+  !insertmacro MUI_PAGE_INSTFILES
+  
+  !insertmacro MUI_UNPAGE_CONFIRM
+  !insertmacro MUI_UNPAGE_INSTFILES
 
 
 ;--------------------------------
@@ -76,14 +76,14 @@
   !insertmacro MUI_LANGUAGE "French"
 
   
-;--------------------------------\r
-;Reserve Files\r
-  \r
-  ;These files should be inserted before other files in the data block\r
-  ;Keep these lines before any File command\r
-  ;Only for solid compression (by default, solid compression is enabled for BZIP2 and LZMA)\r
-  \r
-  !insertmacro MUI_RESERVEFILE_LANGDLL\r
+;--------------------------------
+;Reserve Files
+  
+  ;These files should be inserted before other files in the data block
+  ;Keep these lines before any File command
+  ;Only for solid compression (by default, solid compression is enabled for BZIP2 and LZMA)
+  
+  !insertmacro MUI_RESERVEFILE_LANGDLL
 
 
 ;--------------------------------
@@ -197,8 +197,11 @@ Section "Uninstall"
   DeleteRegKey /ifempty HKCU "Software\${MUI_PROD}"
 
   Delete "$INSTDIR\Uninstall.exe"
+  Delete "$INSTDIR\README.TXT"
 
-  RMDir /r "$INSTDIR"
+  RMDir /r "$INSTDIR/docs"
+  RMDir /r "$INSTDIR/tools"
+  RMDir /r "$INSTDIR/wwwroot"
 
 SectionEnd