Do the Windows build in a subdirectory windows/build32.

[PuTTY.git] / windows / installer.wxs

diff --git a/windows/installer.wxs b/windows/installer.wxs
index 52e7cb771effeb472a5c9d3b51bc81c600ac129c..53a3f84eb14a731d778796e8d2b0b426738a5970 100644 (file)
--- a/windows/installer.wxs
+++ b/windows/installer.wxs
@@ -92,7 +92,7 @@
           <Component Id="PuTTY_Component"
                      Guid="07ACF511-6DF6-4883-AABA-33BC14901324">
             <File Id="PuTTY_File"
-                  Source="putty.exe" KeyPath="yes">
+                  Source="$(var.Builddir)putty.exe" KeyPath="yes">
               <Shortcut Id="startmenuPuTTY" Directory="ProgramMenuDir"
                         WorkingDirectory="INSTALLDIR"
                         Name="PuTTY" Advertise="no" />
@@ -101,7 +101,7 @@
           <Component Id="Pageant_Component"
                      Guid="649F963E-21C4-4755-8CE4-D80598DCEE6D">
             <File Id="Pageant_File"
-                  Source="pageant.exe" KeyPath="yes">
+                  Source="$(var.Builddir)pageant.exe" KeyPath="yes">
               <Shortcut Id="startmenuPageant" Directory="ProgramMenuDir"
                         WorkingDirectory="INSTALLDIR"
                         Name="Pageant" Advertise="no" />
@@ -110,7 +110,7 @@
           <Component Id="PSFTP_Component"
                      Guid="3D7B9536-EC0E-4A6A-A3DF-8D285474391A">
             <File Id="PSFTP_File"
-                  Source="psftp.exe" KeyPath="yes">
+                  Source="$(var.Builddir)psftp.exe" KeyPath="yes">
               <Shortcut Id="startmenuPSFTP" Directory="ProgramMenuDir"
                         WorkingDirectory="INSTALLDIR"
                         Name="PSFTP" Advertise="no" />
@@ -119,7 +119,7 @@
           <Component Id="PuTTYgen_Component"
                      Guid="4774F6B3-8A07-42A5-9F4D-E7FE6AA78B84">
             <File Id="PuTTYgen_File"
-                  Source="puttygen.exe" KeyPath="yes">
+                  Source="$(var.Builddir)puttygen.exe" KeyPath="yes">
               <Shortcut Id="startmenuPuTTYgen" Directory="ProgramMenuDir"
                         WorkingDirectory="INSTALLDIR"
                         Name="PuTTYgen" Advertise="no" />
@@ -128,12 +128,12 @@
           <Component Id="Plink_Component"
                      Guid="7D96F9BB-4154-49D6-86AE-0D8F1379ACBC">
             <File Id="Plink_File"
-                  Source="plink.exe" KeyPath="yes" />
+                  Source="$(var.Builddir)plink.exe" KeyPath="yes" />
           </Component>
           <Component Id="PSCP_Component"
                      Guid="71519D4A-3ED5-4A46-A7E4-B6E4600A8684">
             <File Id="PSCP_File"
-                  Source="pscp.exe" KeyPath="yes" />
+                  Source="$(var.Builddir)pscp.exe" KeyPath="yes" />
           </Component>
 
           <Component Id="HelpFile_Component"