2008-11-10 Marcus Brinkmann <marcus@g10code.com>
authorMarcus Brinkmann <mb@g10code.com>
Mon, 10 Nov 2008 15:35:15 +0000 (15:35 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Mon, 10 Nov 2008 15:35:15 +0000 (15:35 +0000)
* src/installer-finish.nsi (no_quick_launch_uninstall): Clean up
GNU directory, if empty.

ChangeLog
src/installer-finish.nsi

index c84acd4..fffe5c4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,9 @@
 2008-11-10  Marcus Brinkmann  <marcus@g10code.com>
 
-       * src/inst-gpa.nsi (DESC_Menu_Gpa): Remove winpt reference.
+       * src/installer-finish.nsi (no_quick_launch_uninstall): Clean up
+       GNU directory, if empty.
 
-2008-11-10  Marcus Brinkmann  <marcus@g10code.com>
+       * src/inst-gpa.nsi (DESC_Menu_Gpa): Remove winpt reference.
 
        * src/installer.nsi: Give German translation for language setup.
        Clarify string.
index 3b3c47c..6f92730 100644 (file)
@@ -150,6 +150,11 @@ no_quick_launch_uninstall:
   Delete "$INSTDIR\${PACKAGE}-uninstall.exe"
   RMDir "$INSTDIR"
 
+  # If we installed in the default location, try to be really, really
+  # nice with sugar on it to clean up behind us.
+  StrCmp "$INSTDIR" "$PROGRAMFILES\GNU\${INSTALL_DIR}" 0 +2
+  RMDir "$PROGRAMFILES\GNU"
+
   # Clean the registry.
   DeleteRegValue HKLM "Software\GNU\${PRETTY_PACKAGE_SHORT}" \
         "Install Directory"