DEVEL15-windows-wix-client-path-20060625

move <Environment> tag to a component that will be installed
as part of the 32-bit tools so that Client\Program is added to
the PATH.

(cherry picked from commit ea499821f73a9f27aad36b1878cccd26b2dc55c5)

diff --git a/src/WINNT/install/wix/files.wxi b/src/WINNT/install/wix/files.wxi
index a007151..89fc086 100644 (file)
--- a/src/WINNT/install/wix/files.wxi
+++ b/src/WINNT/install/wix/files.wxi
@@ -870,7 +870,6 @@
                             <ServiceDependency Id="NetBIOS" />
                             <ServiceDependency Id="PNP_TDI" Group="yes"/>
                         </ServiceInstall>
-                        <Environment Id="envClient" Name="PATH" Action="create" System="yes" Permanent="no" Part="last" Separator=";" Value="[AFSDIR]Client\Program" />
                         <RemoveFile Id="removeCache" Directory="WindowsVolume" LongName="AFSCache" Name="AFSCache" On="uninstall" />
                     </Component>
   <?endif?>
@@ -911,6 +910,7 @@
                    <?endif?>
                      <Component Win64="$(var.Win64)" Id="cmf_cmdebug_EXE" Guid="$(var.cmf_cmdebug_EXE_guid)">
                         <File Id="filecmdebug_EXE" Name="cmdebug.exe" LongName="cmdebug.exe" KeyPath="yes" DiskId="1" />
+                        <Environment Id="envClient" Name="PATH" Action="create" System="yes" Permanent="no" Part="last" Separator=";" Value="[AFSDIR]Client\Program" />
                     </Component>
   <?ifndef BinsOnly?>
                    <Component Win64="$(var.Win64)" Id="cmf_afs_cpa_CPL" Guid="$(var.cmf_afs_cpa_CPL_guid)">