Build the error table header files into include, not include/krb5; and

construct krb5.h from krb5.hin and the error table header files.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6813 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/ChangeLog b/src/ChangeLog
index 75f3214c006f3bc013d992b7307a4a7a60086327..4eb902abb9571e0d84a3110e95f48c509ef5708b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+Fri Sep 22 19:39:30 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+       * Makefile.in (awk-windows-mac): Build the error table header
+               files into include, not include/krb5; and construct krb5.h
+               from krb5.hin and the error table header files.
+
 Fri Sep 15 05:05:15 1995  Theodore Y. Ts'o  <tytso@dcl>
 
        * Makefile.in (kerbsrc-nt.zip): Update production rule to be like

diff --git a/src/Makefile.in b/src/Makefile.in
index f4cec8efa6809aaae5040583e4b89a959f766295..3c6ce0c7a68a1b09b4b6c7a61faf3135f9755e97 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -222,7 +222,7 @@ CLEANUP= util/profile/profile.h util/profile/prof_err.[ch] \
        lib/krb5/error_tables/adm_err.c \
        include/krb5/asn1_err.h include/krb5/kdb5_err.h \
        include/krb5/krb5_err.h include/krb5/kv5m_err.h \
-       include/krb5/adm_err.h include/profile.h \
+       include/krb5/adm_err.h include/profile.h include/krb5.h \
        lib/gssapi/generic/gssapi_err_generic.[ch] \
        lib/gssapi/krb5/gssapi_err_krb5.[ch]
 
@@ -261,7 +261,7 @@ kerbsrc.mac: awk-windows-mac
 #
 AH  = util/et/et_h.awk
 AC  = util/et/et_c.awk
-INC = include/krb5/
+INC = include/
 ET  = lib/krb5/error_tables/
 GG  = lib/gssapi/generic/
 GK  = lib/gssapi/krb5/
@@ -273,6 +273,8 @@ awk-windows-mac:
        gawk -f $(AH) outfile=$(INC)krb5_err.h $(ET)krb5_err.et
        gawk -f $(AH) outfile=$(INC)kv5m_err.h $(ET)kv5m_err.et
        gawk -f $(AH) outfile=$(INC)adm_err.h $(ET)adm_err.et
+       cat $(INC)/krb5.hin $(INC)/krb5_err.h $(INC)/kdb5_err.h \
+               $(INC)/kv5m_err.h $(INC)/asn1_err.h > $(INC)/krb5.h
        gawk -f $(AC) outfile=$(ET)asn1_err.c $(ET)asn1_err.et
        gawk -f $(AC) outfile=$(ET)kdb5_err.c $(ET)kdb5_err.et
        gawk -f $(AC) outfile=$(ET)krb5_err.c $(ET)krb5_err.et