Mercurial > hg
changeset 10735:054652eeeaf1
Merge with stable
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Fri, 19 Mar 2010 11:32:55 +0100 |
| parents | 7a0502a6f9a1 (current diff) e26102c40e2e (diff) |
| children | 5303b56eabc9 |
| files | contrib/wix/mercurial.wxs |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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' >