From 9119b4686b768e4efeceb628d999b122a5909da2 Mon Sep 17 00:00:00 2001
From: Kolan Sh <mecareful@gmail.com>
Date: Mon, 24 Dec 2012 15:13:26 +0400
Subject: [PATCH] NSIS: Custom install path was not considered during
 uninstallation.

When CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL CPack variable set to ON
the user see dialogue "the package is already installed.
Do you want to uninstall the old version before installing the new one?"
Answering "Yes" the user sees dialogue with a default installation path
instead of a path where the application is installed.
---
 Modules/NSIS.template.in |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/Modules/NSIS.template.in b/Modules/NSIS.template.in
index 59a444b..8853e3e 100644
--- a/Modules/NSIS.template.in
+++ b/Modules/NSIS.template.in
@@ -162,6 +162,7 @@ Var AR_RegFlags
 
 !verbose 3
 !include "WinMessages.NSH"
+!include "FileFunc.NSH"
 !verbose 4
 
 ;----------------------------------------
@@ -916,7 +917,8 @@ Function .onInit
 ;Run the uninstaller
 uninst:
   ClearErrors
-  ExecWait '$0 _?=$INSTDIR' ;Do not copy the uninstaller to a temp file
+  ${GetParent} "$0" $1 ;Get custom install path
+  ExecWait '$0 _?=$1'  ;Do not copy the uninstaller to a temp file
 
   IfErrors uninst_failed inst
 uninst_failed:
-- 
1.7.8.6