diff options
Diffstat (limited to 'src/mac/MacOSX/Scripts')
| -rw-r--r-- | src/mac/MacOSX/Scripts/Kerberos5Headers.jam | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/mac/MacOSX/Scripts/Kerberos5Headers.jam b/src/mac/MacOSX/Scripts/Kerberos5Headers.jam index 31b12dbab..23b411a26 100644 --- a/src/mac/MacOSX/Scripts/Kerberos5Headers.jam +++ b/src/mac/MacOSX/Scripts/Kerberos5Headers.jam @@ -21,7 +21,7 @@ OsconfH = "$(IntermediateV5Includes)/osconf.h" ; rule CatHeader { NOTFILE "$(2[1])" ; - DEPENDS "$(1)" : "$(2[2-])" "$(AutoconfH)" ; + DEPENDS "$(1)" : "$(2[3-])" "$(AutoconfH)" ; Clean.Remove clean : "$(1)" ; } actions CatHeader @@ -36,16 +36,18 @@ actions CatHeader echo "#define $(2[1])" >> "$(1)" echo "" >> "$(1)" echo "/* Environment dependent macros */" >> "$(1)" - grep SIZEOF "$(AutoconfH)" >> "$(1)" - echo "" >> "$(1)" - for header in "$(2[3-])" ; do + if [ -n "$(2[2])" ]; then + $(SED) -e 's:SIZEOF:$(2[2])SIZEOF:' "$(AutoconfH)" | grep SIZEOF >> "$(1)" + echo "" >> "$(1)" + fi + for header in "$(2[4-])" ; do base=`basename "${header}"` echo "" >> "$(1)" echo "/* Error tables from ${base} */" >> "$(1)" cat "${header}" | $(ExtractErrorCodes) >> "$(1)" done echo "" >> "$(1)" - cat "$(2[2])" >> "$(1)" + cat "$(2[3])" >> "$(1)" echo "#endif /* $(2[1]) */" >> "$(1)" } @@ -92,12 +94,12 @@ CopyHeader "$(IntermediateV4Includes)/krb_err.h" : "$(Intermediat MakeFrameworkHeader "$(IntermediateFrameworkHeaders)/krb.h" : "$(IntermediateV4Includes)/krb.h" ; MakeFrameworkHeader "$(IntermediateFrameworkHeaders)/krb_err.h" : "$(IntermediateV4Includes)/krb_err.h" ; -CatHeader "$(IntermediateIncludes)/profile.h" : "__KERBEROSPROFILE__" +CatHeader "$(IntermediateIncludes)/profile.h" : "__KERBEROSPROFILE__" "" "$(SRCROOT)/../../Kerberos5/Sources/util/profile/profile.hin" "$(IntermediateErrorTables)/prof_err.h" ; MakeFrameworkHeader "$(IntermediateFrameworkHeaders)/profile.h" : "$(IntermediateIncludes)/profile.h" ; -CatHeader "$(IntermediateIncludes)/krb5.h" : "__KERBEROS5__" +CatHeader "$(IntermediateIncludes)/krb5.h" : "__KERBEROS5__" "" "$(SRCROOT)/../../Kerberos5/Sources/include/krb5.hin" "$(IntermediateErrorTables)/asn1_err.h" "$(IntermediateErrorTables)/kdb5_err.h" @@ -106,7 +108,7 @@ CatHeader "$(IntermediateIncludes)/krb5.h" : "__KERBEROS "$(IntermediateErrorTables)/kv5m_err.h" ; MakeFrameworkHeader "$(IntermediateFrameworkHeaders)/krb5.h" : "$(IntermediateIncludes)/krb5.h" ; -CatHeader "$(IntermediateGSSIncludes)/gssapi.h" : "__GSSAPI__" +CatHeader "$(IntermediateGSSIncludes)/gssapi.h" : "__GSSAPI__" "GSS_" "$(SRCROOT)/../../Kerberos5/Sources/lib/gssapi/generic/gssapi.hin" "$(IntermediateErrorTables)/gssapi_err_generic.h" "$(IntermediateErrorTables)/gssapi_err_krb5.h" ; |