# HG changeset patch
# User Steve Borho <steve@borho.org>
# Date 1299601518 21600
# Node ID c1ae4ecda8da6c506450093ef7f3cd1779a5a7ce
# Parent  7c6e9b57a4cc339040c1e415f1325ce4b1db4764# Parent  391948925b670839f1a7d498d8fc34e33b5ea112
merge with stable

diff -r 7c6e9b57a4cc -r c1ae4ecda8da contrib/wix/guids.wxi
--- a/contrib/wix/guids.wxi	Tue Mar 08 11:01:01 2011 +0100
+++ b/contrib/wix/guids.wxi	Tue Mar 08 10:25:18 2011 -0600
@@ -47,6 +47,5 @@
   <?define paths.rc.guid = {F9ADF21D-5F0B-4934-8CD9-14BE63664721} ?>
   <?define cacert.pem.guid = {EC1B2630-FE21-46E6-915B-A6545AF703D4} ?>
   <?define ProgramMenuDir.guid = {D5A63320-1238-489B-B68B-CF053E9577CA} ?>
-  <?define hgcmd.guid = {65CCC756-E72E-4C5F-901E-D575EDC80DB3} ?>
 
 </Include>
diff -r 7c6e9b57a4cc -r c1ae4ecda8da contrib/wix/mercurial.wxs
--- a/contrib/wix/mercurial.wxs	Tue Mar 08 11:01:01 2011 +0100
+++ b/contrib/wix/mercurial.wxs	Tue Mar 08 10:25:18 2011 -0600
@@ -62,7 +62,7 @@
           <Component Id='MainExecutable' Guid='$(var.ComponentMainExecutableGUID)' Win64='$(var.IsX64)'>
             <File Id='hgEXE' Name='hg.exe' Source='dist\hg.exe' KeyPath='yes' />
             <Environment Id="Environment" Name="PATH" Part="last" System="yes"
-                         Permanent="no" Value="[INSTALLDIR]bin" Action="set" />
+                         Permanent="no" Value="[INSTALLDIR]" Action="set" />
           </Component>
           <Component Id='ReadMe' Guid='$(var.ReadMe.guid)' Win64='$(var.IsX64)'>
               <File Id='ReadMe' Name='ReadMe.html' Source='contrib\win32\ReadMe.html'
@@ -93,11 +93,6 @@
             </Component>
           </Directory>
 
-          <Directory Id='binFolder' Name='bin'>
-            <Component Id='HgCmd' Guid='$(var.hgcmd.guid)' Win64='$(var.IsX64)'>
-                <File Id='Hg.Cmd' Name='hg.cmd' KeyPath='yes' Source='contrib\wix\hg.cmd' />
-            </Component>
-          </Directory>
         </Directory>
       </Directory>
 
@@ -140,7 +135,6 @@
         <ComponentRef Id='paths.rc' />
         <ComponentRef Id='cacert.pem' />
         <ComponentRef Id='helpFolder' />
-        <ComponentRef Id='HgCmd' />
         <ComponentGroupRef Id='templatesFolder' />
         <MergeRef Id='VCRuntime' />
         <MergeRef Id='VCRuntimePolicy' />