From a6ece012ea51b4a5a07522e6823f909ac61f51f0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 21 May 2011 18:02:37 -0600
Subject: [PATCH] Windows installer: Remember and use previous installation
 folder when upgrading

---
 setup/installer/windows/wix-template.xml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/setup/installer/windows/wix-template.xml b/setup/installer/windows/wix-template.xml
index 9835ae8f6b..8526c27720 100644
--- a/setup/installer/windows/wix-template.xml
+++ b/setup/installer/windows/wix-template.xml
@@ -26,6 +26,11 @@
                </Upgrade>
                <CustomAction Id="PreventDowngrading" Error="Newer version already installed."/>
 
+               <Property Id="APPLICATIONFOLDER">
+                  <RegistrySearch Id='calibreInstDir' Type='raw'
+                      Root='HKLM' Key="Software\{app}\Installer" Name="InstallPath" />
+               </Property>
+
                 <Directory Id='TARGETDIR' Name='SourceDir'>
                         <Merge Id="VCRedist" SourceFile="{crt_msm}" DiskId="1" Language="0"/>
 						<Directory Id='ProgramFilesFolder' Name='PFiles'>
@@ -43,6 +48,9 @@
                             <Environment Id='UpdatePath' Name='PATH' Action='set' System='yes' Part='last' Value='[APPLICATIONFOLDER]' />
                             <RegistryValue Root="HKCU" Key="Software\Microsoft\{app}" Name="system_path_updated" Type="integer" Value="1" KeyPath="yes"/>
                         </Component>
+                        <Component Id="RememberInstallDir" Guid="*">
+                            <RegistryValue Root="HKLM" Key="Software\{app}\Installer" Name="InstallPath" Type="string" Value="[APPLICATIONFOLDER]" KeyPath="yes"/>
+                        </Component>
                 </DirectoryRef>
 
                 <DirectoryRef Id="ApplicationProgramsFolder">
@@ -87,7 +95,8 @@
 						ConfigurableDirectory="APPLICATIONFOLDER">
 
 						<Feature Id="MainApplication" Title="Program Files" Level="1"
-                            Description="All the files need to run {app}" Absent="disallow">
+                            Description="All the files needed to run {app}" Absent="disallow">
+                            <ComponentRef Id="RememberInstallDir"/>
                         </Feature>
 
                         <Feature Id="VCRedist" Title="Visual C++ 8.0 Runtime" AllowAdvertise="no" Display="hidden" Level="1">