From b70a95b507e19742019fc542c8860c04ae3c2aa5 Mon Sep 17 00:00:00 2001
From: Tom Yu <tlyu@mit.edu>
Date: Wed, 18 Apr 2007 22:17:26 +0000
Subject: [PATCH] pull up r19458 from trunk

 r19458@cathode-dark-space:  jaltman | 2007-04-13 03:21:25 -0400
 ticket: 5527

      sdkfiles.xml - add msi-deployment-guide.txt

      copyfiles.xml - add msi-deployment-guide.txt
         and do not copy netiddev.chm twice



ticket: 5527
version_fixed: 1.6.1

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@19506 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/windows/build/copyfiles.xml | 3 ++-
 src/windows/build/sdkfiles.xml  | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/windows/build/copyfiles.xml b/src/windows/build/copyfiles.xml
index d571be63d..2fb3747c8 100644
--- a/src/windows/build/copyfiles.xml
+++ b/src/windows/build/copyfiles.xml
@@ -121,12 +121,13 @@
           <File name="gss.exe"              from="..\target\bin\i386\%bldtype%\"    to="\bin\i386" />
           <File name="comerr32.dll"         from="..\target\bin\i386\%bldtype%\"    to="\bin\i386" />
           <File name="netiddev.chm"         from="..\target\bin\i386\%bldtype%\"                            to="\doc" />
-          <File name="NetIddev.chm"         from="auth\krb5\src\windows\identity\obj\i386\%bldtype%\doc\"   to="\doc" newname="netiddev.chm" />
+<!-- why copy twice?          <File name="NetIddev.chm"         from="auth\krb5\src\windows\identity\obj\i386\%bldtype%\doc\"   to="\doc" newname="netiddev.chm" /> -->
 
         <!-- Build-INdependent files, always copied: -->
         <File name="relnotes.html"          from="..\doc\kerberos\"                                         to="\doc" />
         <File name="leash_userdoc.pdf"      from="auth\leash\help\"                                         to="\doc" />
         <File name="NetIdMgr.pdf"           from="auth\krb5\src\windows\identity\doc\"                      to="\doc" newname="netidmgr_userdoc.pdf" />
+        <File name="msi-deployment-guide.txt" from="auth\krb5\src\windows\installer\wix\"   to="\doc" />
         <File name="*"                      from="auth\krb5\src\windows\identity\sample\templates\credprov\"            to="\sample\templates\credprov\" />
         <File name="*"                      from="auth\krb5\src\windows\identity\sample\templates\credprov\images\"     to="\sample\templates\credprov\images" />
         <File name="*"                      from="auth\krb5\src\windows\identity\sample\templates\credprov\lang\"       to="\sample\templates\credprov\lang" />
diff --git a/src/windows/build/sdkfiles.xml b/src/windows/build/sdkfiles.xml
index 5ef7f48fb..3c1481f17 100644
--- a/src/windows/build/sdkfiles.xml
+++ b/src/windows/build/sdkfiles.xml
@@ -7,6 +7,7 @@
 
 		<File name="relnotes.html"  from="doc\kerberos"                 to="doc" />
 		<File name="kclient.rtf"    from="athena\auth\krb4\kclient\doc" to="doc" />
+                <File name="msi-deployment-guide.txt" from="athena\auth\krb5\src\windows\installer\wix\"   to="\doc" />
 
 		<File  name="*.*"           from="staging\inc"                  to="inc" />
 		<!-- loadfuncs.c is deliberately here.  Otherwise, *.h would work. -->
-- 
2.26.2