From 87f20f11e220241ced3ba8a32d8d9867d2baebd9 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sat, 14 Nov 2015 22:23:47 -0800
Subject: Use stack for Windows installer.

---
 windows/pandoc.wxs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'windows/pandoc.wxs')

diff --git a/windows/pandoc.wxs b/windows/pandoc.wxs
index c1465ffcf..d19ed81e1 100644
--- a/windows/pandoc.wxs
+++ b/windows/pandoc.wxs
@@ -41,11 +41,11 @@
                            KeyPath="yes"/>
             <RemoveFolder Id="APPLICATIONFOLDER" On="uninstall"/>
             <File Id="pandocEXE" Name="pandoc.exe"
-                  Source="..\.cabal-sandbox\bin\pandoc.exe" />
+                  Source="$(var.BINPATH)\pandoc.exe" />
             <File Id="pandocCOPYRIGHT" Name="COPYRIGHT.txt"
-                  Source="..\COPYRIGHT.txt" />
+                  Source="COPYRIGHT.txt" />
             <File Id="pandocCOPYING" Name="COPYING.rtf"
-                  Source="..\COPYING.rtf" />
+                  Source="COPYING.rtf" />
           </Component>
 
           <Component Id="CitationSupport"
@@ -55,13 +55,13 @@
                            Name="Version" Type="string" Value="[ProductVersion]"
                            KeyPath="yes"/>
             <File Id="pandoc_citeprocEXE" Name="pandoc-citeproc.exe"
-                  Source="..\.cabal-sandbox\bin\pandoc-citeproc.exe" />
+                  Source="$(var.BINPATH)\pandoc-citeproc.exe" />
           </Component>
 
           <Component Id="Documentation"
                      Guid="A8D54A76-1A3D-4647-8327-81B69D39D8A3">
             <File Id="pandocREADME" Name="Pandoc User's Guide.html"
-                  Source="..\README.html" KeyPath="yes">
+                  Source="README.html" KeyPath="yes">
               <Shortcut Id="ApplicationStartMenuShortcut"
                         Directory="ApplicationProgramsFolder"
                         Name="Pandoc User’s Guide" Advertise="yes" />
@@ -163,7 +163,7 @@
     <Property Id="ALLUSERS" Value="2" Secure="yes" />
     <Property Id="MSIINSTALLPERUSER" Value="1" />
 
-    <WixVariable Id="WixUILicenseRtf" Value="..\COPYING.rtf" />
+    <WixVariable Id="WixUILicenseRtf" Value="COPYING.rtf" />
 
     <UI Id="MyWixUI_Advanced">
       <UIRef Id="WixUI_Advanced" />
-- 
cgit v1.2.3