From: eldy <>
Date: Thu, 31 Jul 2008 13:50:02 +0000 (+0000)
Subject: Avoid removing dir in awstats
X-Git-Tag: AWSTATS_6_9_BETA~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=080493e6b08321f02e3dc0e3fda8f1b0af61c318;p=thirdparty%2FAWStats.git

Avoid removing dir in awstats
---

diff --git a/make/exe/awstats.nsi b/make/exe/awstats.nsi
index 9d4cd952..b3ced739 100644
--- a/make/exe/awstats.nsi
+++ b/make/exe/awstats.nsi
@@ -38,35 +38,35 @@
 
 
 
-;--------------------------------
-;Interface Settings
-
-  !define MUI_ABORTWARNING
-
+;--------------------------------
+;Interface Settings
+
+  !define MUI_ABORTWARNING
 
-;--------------------------------
-;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"
+;--------------------------------
+;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"
 
-;--------------------------------
-;Pages
+
+;--------------------------------
+;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
-  !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
+  !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"
 
   
-;--------------------------------
-;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
+;--------------------------------
+;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