From 943fcf6cdfd6623895056a3c322983b7dfa5bf09 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Tue, 17 Jan 2012 11:19:25 -0800
Subject: [PATCH] dist: Make the win32 uninstaller work

---
 src/etc/pkg/rust.nsi | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/etc/pkg/rust.nsi b/src/etc/pkg/rust.nsi
index c4deff8daa8e..2b2bfa28c551 100644
--- a/src/etc/pkg/rust.nsi
+++ b/src/etc/pkg/rust.nsi
@@ -18,10 +18,6 @@ Page instfiles
 UninstPage uninstConfirm
 UninstPage instfiles
 
-Section
-    WriteUninstaller $INSTDIR\uninstall.exe
-SectionEnd
-
 Section "Compiler"
     SetOutPath $INSTDIR
     File /nonfatal /r i686-pc-mingw32\stage3\*.*
@@ -36,17 +32,17 @@ SectionEnd
 Section "Uninstall"
     Delete $INSTDIR\uninstall.exe
     Delete $INSTDIR\bin\*.*
-    Delete $INSTDIR\lib\*.*
-    Delete $INSTDIR\lib\rustc\i686-pc-mingw32\bin\*.*
-    Delete $INSTDIR\lib\rustc\i686-pc-mingw32\lib\*.*
+    Delete $INSTDIR\bin\rustc\i686-pc-mingw32\bin\*.*
     Delete $INSTDIR\doc\rust.html
     Delete $INSTDIR\doc\rust.pdf
+    RMDir $INSTDIR\bin\rustc\i686-pc-mingw32\bin
+    RMDir $INSTDIR\bin\rustc\i686-pc-mingw32
+    RMDir $INSTDIR\bin\rustc
     RMDir $INSTDIR\bin
-    RMDir $INSTDIR\lib\rustc\i686-pc-mingw32\bin
-    RMDir $INSTDIR\lib\rustc\i686-pc-mingw32\lib
-    RMDir $INSTDIR\lib\rustc\i686-pc-mingw32
-    RMDir $INSTDIR\lib\rustc
-    RMDir $INSTDIR\lib
     RMDir $INSTDIR\doc
     RMDir $INSTDIR
 SectionEnd
+
+Section
+    WriteUninstaller $INSTDIR\uninstall.exe
+SectionEnd