pull up r19572 from trunk

 r19572@cathode-dark-space:  jaltman | 2007-06-11 18:14:56 -0400
 ticket: 5573
 tags: pullup

 This patch adds src/include/krb5/krb5.h to the MSI installer SDK component.
 (Thanks to Asanka Herath for the patch.)

ticket: 5573
version_fixed: 1.6.2

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

diff --git a/src/windows/installer/wix/features.wxi b/src/windows/installer/wix/features.wxi
index 72480a94ccacacfa4304290d3a092ab78e639697..e07cc04cc9fb4c203197f20609c3fa8b095b8662 100644 (file)
--- a/src/windows/installer/wix/features.wxi
+++ b/src/windows/installer/wix/features.wxi
@@ -241,6 +241,7 @@
             <ComponentRef Id="cmp_dirinc_krb4" />
             <ComponentRef Id="cmp_dirinc_krb5_gssapi" />
             <ComponentRef Id="cmp_dirinc_krb5_KerberosIV" />
+            <ComponentRef Id="cmp_dirinc_krb5_krb5" />
             <ComponentRef Id="cmp_dirinc_krb5" />
             <ComponentRef Id="cmp_dirinc_krbcc" />
             <ComponentRef Id="cmp_dirinc_leash" />
@@ -278,4 +279,4 @@
         </Feature>
         
     </Feature>
-</Include>
\ No newline at end of file
+</Include>

diff --git a/src/windows/installer/wix/files.wxi b/src/windows/installer/wix/files.wxi
index aa37d79229ef74b878bac719c05d48d29aa733c3..b1ff8f883bf89305fc32d8264798f19e6ac50307 100644 (file)
--- a/src/windows/installer/wix/files.wxi
+++ b/src/windows/installer/wix/files.wxi
@@ -664,6 +664,11 @@
                                 <File Id="fil_mit_copyright_.h" LongName="mit-copyright.h" Name="MIT-COPY.H" />
                             </Component>
                         </Directory>
+                        <Directory Id="dirinc_krb5_krb5" Name="krb5" src="$(var.IncDir)\krb5\krb5\">
+                            <Component Id="cmp_dirinc_krb5_krb5" Guid="D1E4E3D8-EF04-4DD6-B01E-F87876509869" DiskId="1">
+                                <File Id="fil_krb5_h_inc" LongName="krb5.h" Name="krb5.h" KeyPath="yes" />
+                            </Component>
+                        </Directory>
                         <Component Id="cmp_dirinc_krb5" Guid="7FD8008B-2F46-4613-8A09-989F643258F1" DiskId="1">
                             <File Id="fil_com_err_.h" LongName="com_err.h" Name="com_err.h" />
                             <File Id="fil_krb5_.h" LongName="krb5.h" Name="krb5.h" KeyPath="yes" />
@@ -1001,4 +1006,4 @@
     </Component>
 
 </Directory>
-</Include>
\ No newline at end of file
+</Include>