From eaa78fbd58dc952fd02f910bcfa0e03858b298cb Mon Sep 17 00:00:00 2001
From: Kimmo Varis <kimmov@gmail.com>
Date: Sat, 26 Mar 2011 16:14:11 +0200
Subject: [PATCH] Installer: don't install local help file.

---
 win_installer/cppcheck.wxs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/win_installer/cppcheck.wxs b/win_installer/cppcheck.wxs
index 3c9a5c66e..47440dd51 100644
--- a/win_installer/cppcheck.wxs
+++ b/win_installer/cppcheck.wxs
@@ -55,19 +55,19 @@
             <File Id='authors.txt' Name='authors.txt' DiskId='1' Source='..\authors' />
             <File Id='readme.txt' Name='readme.txt' DiskId='1' Source='..\readme.txt' />
           </Component>
-          <Component Id='GuiHelp' Guid='*'>
-            <File Id='onlinehelp.qhc' Name='online-help.qhc' DiskId='1' Source='$(var.HelpDir)\online-help.qhc' KeyPath='yes' />
-          </Component>
 
           <!-- Cleanup runtime files installed by previous InnoSetup installer.
                Also remove old gui.exe which is now cppcheck-gui.exe.
-               Remove old Swedish translation file which was renamed. -->
+               Remove old Swedish translation file which was renamed.
+               Remove locally installed help file that didn't work.
+          -->
           <Component Id='InnoSetupCleanup' Guid='4A3F299D-1EE1-468b-814B-D6577F0698CA'>
             <RemoveFile Id="msvcp90.dll" On="install" Name="msvcp90.dll" />
             <RemoveFile Id="msvcr90.dll" On="install" Name="msvcr90.dll" />
             <RemoveFile Id="Microsoft.VC90.CRT.manifest" On="install" Name="Microsoft.VC90.CRT.manifest" />
             <RemoveFile Id="gui.exe" On="install" Name="gui.exe" />
             <RemoveFile Id="cppcheck_se.qm" On="install" Name="cppcheck_se.qm" />
+            <RemoveFile Id="onlinehelp.qhc" On="install" Name="onlinehelp.qhc" />
           </Component>
         </Directory>
         <Merge Id="CRT" Language="0" SourceFile="$(var.CrtMergeModule)" DiskId="1" />
@@ -91,7 +91,6 @@
         <ComponentRef Id='GuiExecutable' />
         <ComponentRef Id='GuiTranslations' />
         <ComponentRef Id='BaseDocs' />
-        <ComponentRef Id='GuiHelp' />
         <ComponentRef Id='ProgramMenuDir' />
         <ComponentRef Id='InnoSetupCleanup' />
       </Feature>