[PATCH 1 of 2 STABLE] wix: use build variable for VC redist source dir
Adrian Buehlmann
adrian at cadifra.com
Fri Mar 19 05:01:53 CDT 2010
# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1268990779 -3600
# Branch stable
# Node ID 3f26a94d4ca11dbd13fb145aaaf14d360223da3a
# Parent 47fbbc4845ff259e7e90a74a5226976bb266e737
wix: use build variable for VC redist source dir
diff --git a/contrib/wix/mercurial.wxs b/contrib/wix/mercurial.wxs
--- a/contrib/wix/mercurial.wxs
+++ b/contrib/wix/mercurial.wxs
@@ -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'
More information about the Mercurial-devel
mailing list