pull up r18602 from trunk

 r18602@cathode-dark-space:  jaltman | 2006-09-21 11:54:05 -0400
 ticket: 4309

 	oops, make sure we install from the correct source file
 	on Windows 2000

ticket: 4309

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@18615 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/windows/installer/wix/files.wxi b/src/windows/installer/wix/files.wxi
index 08ef9b58f703b3128e2c2fddecbf6babe95d7fff..9ee81bb420803d6d317445a36f18237be62d6d17 100644 (file)
--- a/src/windows/installer/wix/files.wxi
+++ b/src/windows/installer/wix/files.wxi
@@ -358,7 +358,7 @@
                         <Condition>VersionNT &gt; 500</Condition>
                     </Component>
                     <Component Id="cmf_netidmgr_exe_w2k" Guid="0F85D4F3-7897-4FE3-8501-AD0C383CCB4F" DiskId="1" Transitive="yes">
-                       <File Id="fil_netidmgr_exe_w2k" LongName="netidmgr.exe" Name="netidmgr.exe" KeyPath="yes" />
+                       <File Id="fil_netidmgr_exe_w2k" LongName="netidmgr.exe" Name="netidmgr.exe" KeyPath="yes" src="$(var.BinDir)W2K\netidmgr.exe"/>
                        <File Id="fil_netidmgr_chm_w2k" LongName="netidmgr.chm" Name="netidmgr.chm" />
                         <Registry Id="reg_ts_netidmgr_0_w2k" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\netidmgr" Action="createKeyAndRemoveKeyOnUninstall" />
                         <Registry Id="reg_ts_netidmgr_1_w2k" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\netidmgr" Name="Flags" Type="integer" Value="1032" />