--- a/ApplicationDefinition.st	Wed Jun 27 16:21:29 2007 +0200
+++ b/ApplicationDefinition.st	Wed Jul 04 10:46:17 2007 +0200
@@ -1500,7 +1500,7 @@
 Section Uninstall
   Delete "$INSTDIR\${PRODUCT_FILENAME}.url"
   Delete "$INSTDIR\uninst.exe"
-  Delete "$INSTDIR\*"
+%(DIRECTORY_UNINSTALL_LINES)
 
   Delete "$SMPROGRAMS\${PRODUCT_FILENAME}\Uninstall.lnk"
   Delete "$SMPROGRAMS\${PRODUCT_FILENAME}\Website.lnk"
@@ -1508,7 +1508,6 @@
   Delete "$DESKTOP\%(APPLICATION).lnk"
 
   RMDir "$SMPROGRAMS\${PRODUCT_FILENAME}"
-  RMDir /r "$INSTDIR"
 
   DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
   DeleteRegKey HKCR "%(MODULE_KEY).%(PRODUCT_FILENAME).1"
@@ -1746,6 +1745,14 @@
     "Created: / 01-03-2007 / 20:05:20 / cg"
 !
 
+directoryUninstallLines_dot_nsi
+    "%(DIRECTORY_UNINSTALL_LINES)"
+
+  ^'
+    Delete "$INSTDIR\*"
+    RMDir /r "$INSTDIR"'
+!
+
 fileExtensionDefinitionLines_dot_nsi:bindings
     ^ String streamContents:[:s |
         self documentExtensions do:[:ext |
@@ -1883,6 +1890,7 @@
     d at:'ADDITIONAL_SECTIONS' put:(self additionalSections_dot_nsi:d).
     d at:'ADDITIONAL_SECTIONS_DESCRIPTIONS' put:(self additionalSectionsDescriptions_dot_nsi:d).
     d at:'ADDITIONAL_SECTIONS_INSERT_DESCRIPTIONS' put:(self additionalSectionsInsertDescriptions_dot_nsi:d).
+    d at: 'DIRECTORY_UNINSTALL_LINES' put: (self directoryUninstallLines_dot_nsi).
     ^ d
 
     "Created: / 14-09-2006 / 21:08:44 / cg"
@@ -2144,5 +2152,5 @@
 !ApplicationDefinition class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.83 2007-05-30 13:51:50 fm Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.84 2007-07-04 08:46:17 fm Exp $'
 ! !