Mercurial > hg

changeset 10732:5484f6e17984 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
wix: use build variable for VC redist source dir
author Adrian Buehlmann <adrian@cadifra.com>
date Fri, 19 Mar 2010 10:26:19 +0100
parents 4d6bd7b8b6d8
children e26102c40e2e
files contrib/wix/mercurial.wxs
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/wix/mercurial.wxs	Thu Mar 18 19:26:56 2010 +0100
+++ b/contrib/wix/mercurial.wxs	Fri Mar 19 10:26:19 2010 +0100
@@ -80,9 +80,9 @@
 
       <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'