# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1268994775 -3600
# Node ID 054652eeeaf11bc580e8588a2066fe9db23752b6
# Parent  7a0502a6f9a111d3b0e6937b7a676ee7600bae34# Parent  e26102c40e2e726818c64cb01ddcd690aefdeced
Merge with stable

diff -r 7a0502a6f9a1 -r 054652eeeaf1 contrib/wix/mercurial.wxs
--- a/contrib/wix/mercurial.wxs	Mon Mar 15 22:37:38 2010 +0100
+++ b/contrib/wix/mercurial.wxs	Fri Mar 19 11:32:55 2010 +0100
@@ -83,12 +83,12 @@
 
       <Directory Id="DesktopFolder" Name="Desktop" />
       <Merge Id='VCRuntime' DiskId='1' Language='1033'
-             SourceFile='C:\Program Files\Microsoft SDKs\Windows\v7.0\Redist\VC\microsoft.vcxx.crt.x86_msm.msm' />
+             SourceFile='$(var.VCRedistSrcDir)\microsoft.vcxx.crt.x86_msm.msm' />
       <Merge Id='VCRuntimePolicy' DiskId='1' Language='1033'
-             SourceFile='C:\Program Files\Microsoft SDKs\Windows\v7.0\Redist\VC\policy.x.xx.microsoft.vcxx.crt.x86_msm.msm' />
+             SourceFile='$(var.VCRedistSrcDir)\policy.x.xx.microsoft.vcxx.crt.x86_msm.msm' />
     </Directory>
 
-    <Feature Id='Complete' Title='Mercurial $(var.Version)' Description='The complete package'
+    <Feature Id='Complete' Title='Mercurial' Description='The complete package'
         Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR' >
       <Feature Id='MainProgram' Title='Program' Description='Mercurial command line app'
              Level='1' Absent='disallow' >