From 8f1f3bc8203e1b7f8bbbde12b12aac3c6fd0a848 Mon Sep 17 00:00:00 2001
From: Tom Yu <tlyu@mit.edu>
Date: Mon, 12 Dec 2011 20:47:02 +0000
Subject: kfw installer: install leash help file (leash.chm)

Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>

ticket: 7050

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25580 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/windows/installer/wix/features.wxi | 4 ----
 src/windows/installer/wix/files.wxi    | 8 +-------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/windows/installer/wix/features.wxi b/src/windows/installer/wix/features.wxi
index 572cce6421..fa8c8f0d3d 100644
--- a/src/windows/installer/wix/features.wxi
+++ b/src/windows/installer/wix/features.wxi
@@ -96,11 +96,7 @@
             <ComponentRef Id="rcm_leash_5" />
             <ComponentRef Id="rcm_leash_6" />
             
-<!--        <?ifdef OldHelp?>
-            <ComponentRef Id="cmf_leash32_hlp" />
-        <?else?>
             <ComponentRef Id="cmf_leash32_chm" />
-        <?endif?> -->
             
             <!-- Leash dll options -->
             <ComponentRef Id="rcm_leashdll_1" />
diff --git a/src/windows/installer/wix/files.wxi b/src/windows/installer/wix/files.wxi
index 8826ef8202..a7245e7e45 100644
--- a/src/windows/installer/wix/files.wxi
+++ b/src/windows/installer/wix/files.wxi
@@ -197,15 +197,9 @@
                         <Condition>USELEASH</Condition>
                     </Component> -->
 
-<!--                <?ifdef OldHelp?>
-                    <Component Win64="$(var.Win64)" Id="cmf_leash32_hlp" Guid="$(var.cmf_leash32_hlp_guid)" DiskId="1">
-	                    <File Id="fil_leash32_hlp" Name="leash32.hlp" KeyPath="yes" />
-                    </Component>
-                <?else?>
                     <Component Win64="$(var.Win64)" Id="cmf_leash32_chm" Guid="$(var.cmf_leash32_chm_guid)" DiskId="1">
-	                    <File Id="fil_leash32_chm" Name="leash32.chm" KeyPath="yes" />
+	                    <File Id="fil_leash32_chm" Name="leash.chm" KeyPath="yes" />
                     </Component>
-                <?endif?> -->
                     
                     <Component Win64="$(var.Win64)" Id="cmf_leashw32_dll" Guid="$(var.cmf_leashw32_dll_guid)" DiskId="1">
 	                    <File Id="fil_leashw32_dll" Name="$(var.cmf_leashw32_dll_name)" KeyPath="yes" />
-- 
cgit