From 8b54264048cd0035adc244640ec29615b146ab1b Mon Sep 17 00:00:00 2001
From: David Golub <golubdr@gmail.com>
Date: Thu, 2 May 2013 09:47:08 -0400
Subject: [PATCH] CPack/NSIS: Obtain path from which to uninstall from
 registry.

---
 Modules/NSIS.template.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Modules/NSIS.template.in b/Modules/NSIS.template.in
index 59a444b..76310af 100644
--- a/Modules/NSIS.template.in
+++ b/Modules/NSIS.template.in
@@ -916,7 +916,9 @@ Function .onInit
 ;Run the uninstaller
 uninst:
   ClearErrors
-  ExecWait '$0 _?=$INSTDIR' ;Do not copy the uninstaller to a temp file
+  StrLen $2 "\Uninstall.exe"
+  StrCpy $3 $0 -$2 # remove "\Uninstall.exe" from UninstallString to get path
+  ExecWait '$0 _?=$3' ;Do not copy the uninstaller to a temp file
 
   IfErrors uninst_failed inst
 uninst_failed:
-- 
1.8.1.msysgit.1