From d7b6da66c41fe3e8f642d94de67370873e07d95b Mon Sep 17 00:00:00 2001
From: Fyodor Sheremetyev <sheremetyev@gmail.com>
Date: Fri, 15 Mar 2013 15:40:48 +0000
Subject: [PATCH] =?UTF-8?q?WiX:=20Use=20APPLICATIONFOLDER=20property=20nam?=
=?UTF-8?q?e=20as=20required=20by=20=E2=80=9CAdvanced=E2=80=9D=20template.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Followup to cd4ad4bc96f864450b374f34f3ae8b0bf4952d87.
---
windows/pandoc.wxs | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/windows/pandoc.wxs b/windows/pandoc.wxs
index 4da665a18..0301611e2 100644
--- a/windows/pandoc.wxs
+++ b/windows/pandoc.wxs
@@ -28,12 +28,12 @@
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder">
- <Directory Id="INSTALLDIR" Name="Pandoc">
+ <Directory Id="APPLICATIONFOLDER" Name="Pandoc">
<Component Id="MainExecutable"
Guid="ECD35082-4C28-49E1-977E-B90FC7C400C7">
<RegistryValue Root="HKMU" Key="Software\John MacFarlane\Pandoc"
Name="Version" Type="string" Value="[ProductVersion]" KeyPath="yes"/>
- <RemoveFolder Id="INSTALLDIR" On="uninstall"/>
+ <RemoveFolder Id="APPLICATIONFOLDER" On="uninstall"/>
<File Id="pandocEXE" Name="pandoc.exe"
Source="..\cabal-dev\bin\pandoc.exe" />
<File Id="pandocCOPYRIGHT" Name="COPYRIGHT.txt"
@@ -41,7 +41,7 @@
<File Id="pandocCOPYING" Name="COPYING.rtf"
Source="..\COPYING.rtf" />
<Environment Id="UpdatePath" Name="PATH" Action="set"
- Part="last" Value="[INSTALLDIR]" />
+ Part="last" Value="[APPLICATIONFOLDER]" />
</Component>
<Component Id="Documentation"
Guid="A8D54A76-1A3D-4647-8327-81B69D39D8A3">
@@ -66,7 +66,7 @@
</Directory>
- <Feature Id="Complete" Level="1" Title="Pandoc $(var.VERSION)" Description="Complete package" Display="expand" ConfigurableDirectory="INSTALLDIR">
+ <Feature Id="Complete" Level="1" Title="Pandoc $(var.VERSION)" Description="Complete package" Display="expand" ConfigurableDirectory="APPLICATIONFOLDER">
<Feature Id="MainProgram" Title="Program" Description="The main executable." Level="1">
<ComponentRef Id="MainExecutable" />
</Feature>