Index: head/kerberos5/Makefile =================================================================== --- head/kerberos5/Makefile (revision 314656) +++ head/kerberos5/Makefile (revision 314657) @@ -1,31 +1,31 @@ # $FreeBSD$ SUBDIR= lib .WAIT \ libexec tools usr.bin usr.sbin SUBDIR_PARALLEL= # These are the programs which depend on Kerberos. KPROGS= lib/libpam \ secure/lib/libssh secure/usr.bin/ssh secure/usr.sbin/sshd # This target is used to rebuild these programs WITH Kerberos. kerberize: .for entry in ${KPROGS} - cd ${.CURDIR}/../${entry}; \ + cd ${.CURDIR:H}/${entry}; \ ${MAKE} cleandir; \ ${MAKE} obj; \ ${MAKE} all; \ ${MAKE} install .endfor # This target is used to rebuild these programs WITHOUT Kerberos. dekerberize: .for entry in ${KPROGS} - cd ${.CURDIR}/../${entry}; \ + cd ${.CURDIR:H}/${entry}; \ ${MAKE} MK_KERBEROS=no cleandir; \ ${MAKE} MK_KERBEROS=no obj; \ ${MAKE} MK_KERBEROS=no all; \ ${MAKE} MK_KERBEROS=no install .endfor .include Index: head/kerberos5/Makefile.inc =================================================================== --- head/kerberos5/Makefile.inc (revision 314656) +++ head/kerberos5/Makefile.inc (revision 314657) @@ -1,53 +1,53 @@ # $FreeBSD$ .include NO_LINT= -KRB5DIR= ${.CURDIR}/../../../crypto/heimdal +KRB5DIR= ${SRCTOP}/crypto/heimdal -CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/../../include +CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR:H:H}/include .if ${MK_OPENLDAP} != "no" && !defined(COMPAT_32BIT) OPENLDAPBASE?= /usr/local LDAPLDADD= -lldap -llber LDAPDPADD= ${LDAPLDADD:C;^-l(.*)$;${OPENLDAPBASE}/lib/lib\1.a;} LDAPCFLAGS= -I${OPENLDAPBASE}/include -DOPENLDAP=1 -DLDAP_DEPRECATED=1 LDAPLDFLAGS= -L${OPENLDAPBASE}/lib -rpath ${OPENLDAPBASE}/lib .endif .if defined(SRCS) ETSRCS= \ ${KRB5DIR}/lib/asn1/asn1_err.et \ ${KRB5DIR}/lib/hdb/hdb_err.et \ ${KRB5DIR}/lib/kadm5/kadm5_err.et \ ${KRB5DIR}/lib/krb5/heim_err.et \ ${KRB5DIR}/lib/krb5/k524_err.et \ ${KRB5DIR}/lib/krb5/krb5_err.et \ ${KRB5DIR}/lib/krb5/krb_err.et \ ${KRB5DIR}/lib/hx509/hx509_err.et \ ${KRB5DIR}/lib/wind/wind_err.et \ ${KRB5DIR}/lib/ntlm/ntlm_err.et .if ${MK_GSSAPI} != "no" ETSRCS+= ${KRB5DIR}/lib/gssapi/krb5/gkrb5_err.et .endif .for ET in ${ETSRCS} .for _ET in ${ET:T:R} .if ${SRCS:M${_ET}.[ch]} != "" .ORDER: ${_ET}.h ${_ET}.c ${_ET}.c: .NOMETA ${_ET}.h ${_ET}.c: ${ET} compile_et ${.ALLSRC} CLEANFILES+= ${_ET}.h ${_ET}.c .endif .endfor .endfor .endif # defined(SRCS) ASN1_COMPILE= asn1_compile MAKE_ROKEN= make-roken SLC= slc Index: head/kerberos5/lib/libgssapi_krb5/Makefile =================================================================== --- head/kerberos5/lib/libgssapi_krb5/Makefile (revision 314656) +++ head/kerberos5/lib/libgssapi_krb5/Makefile (revision 314657) @@ -1,85 +1,85 @@ # $FreeBSD$ LIB= gssapi_krb5 LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined LIBADD= gssapi krb5 crypto roken asn1 com_err SHLIB_MAJOR= 10 INCS= ${KRB5DIR}/lib/gssapi/gssapi/gssapi_krb5.h INCSDIR= ${INCLUDEDIR}/gssapi SRCS= 8003.c \ accept_sec_context.c \ acquire_cred.c \ add_cred.c \ address_to_krb5addr.c \ aeap.c \ arcfour.c \ authorize_localname.c \ canonicalize_name.c \ ccache_name.c \ cfx.c \ compare_name.c \ compat.c \ context_time.c \ copy_ccache.c \ creds.c \ decapsulate.c \ delete_sec_context.c \ display_name.c \ display_status.c \ duplicate_name.c \ encapsulate.c \ export_name.c \ export_sec_context.c \ external.c \ get_mic.c \ gkrb5_err.c \ gkrb5_err.h \ import_name.c \ import_sec_context.c \ indicate_mechs.c \ init.c \ init_sec_context.c \ inquire_context.c \ inquire_cred.c \ inquire_cred_by_mech.c \ inquire_cred_by_oid.c \ inquire_mechs_for_name.c \ inquire_names_for_mech.c \ inquire_sec_context_by_oid.c \ pname_to_uid.c \ prefix.c \ prf.c \ process_context_token.c \ release_buffer.c \ release_cred.c \ release_name.c \ sequence.c \ set_cred_option.c \ set_sec_context_option.c \ store_cred.c \ ticket_flags.c \ unwrap.c \ verify_mic.c \ wrap.c \ gss_krb5.c \ gss_oid.c #SRCS+= gss_add_oid_set_member.c \ # gss_create_empty_oid_set.c \ # gss_release_buffer.c \ # gss_release_oid_set.c \ # gss_test_oid_set_member.c \ # gss_utils.c CFLAGS+=-I${KRB5DIR}/lib/gssapi CFLAGS+=-I${KRB5DIR}/lib/gssapi/krb5 CFLAGS+=-I${KRB5DIR}/lib/gssapi/gssapi CFLAGS+=-I${KRB5DIR}/lib/krb5 CFLAGS+=-I${KRB5DIR}/lib/asn1 CFLAGS+=-I${KRB5DIR}/lib/roken -I. .include -.PATH: ${KRB5DIR}/lib/gssapi/krb5 ${.CURDIR}/../../../lib/libgssapi +.PATH: ${KRB5DIR}/lib/gssapi/krb5 ${SRCTOP}/lib/libgssapi Index: head/kerberos5/lib/libgssapi_ntlm/Makefile =================================================================== --- head/kerberos5/lib/libgssapi_ntlm/Makefile (revision 314656) +++ head/kerberos5/lib/libgssapi_ntlm/Makefile (revision 314657) @@ -1,48 +1,48 @@ # $FreeBSD$ LIB= gssapi_ntlm LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined LIBADD= crypto gssapi krb5 heimntlm roken SHLIB_MAJOR= 10 SRCS= accept_sec_context.c \ acquire_cred.c \ add_cred.c \ canonicalize_name.c \ compare_name.c \ context_time.c \ creds.c \ crypto.c \ delete_sec_context.c \ display_name.c \ display_status.c \ duplicate_name.c \ export_name.c \ export_sec_context.c \ external.c \ import_name.c \ import_sec_context.c \ indicate_mechs.c \ init_sec_context.c \ inquire_context.c \ inquire_cred_by_mech.c \ inquire_mechs_for_name.c \ inquire_names_for_mech.c \ inquire_sec_context_by_oid.c \ iter_cred.c \ kdc.c \ prefix.c \ process_context_token.c \ release_cred.c \ release_name.c \ gss_oid.c CFLAGS+=-I${KRB5DIR}/lib/gssapi CFLAGS+=-I${KRB5DIR}/lib/gssapi/gssapi CFLAGS+=-I${KRB5DIR}/lib/gssapi/ntlm CFLAGS+=-I${KRB5DIR}/lib/krb5 CFLAGS+=-I${KRB5DIR}/lib/ntlm .include -.PATH: ${KRB5DIR}/lib/gssapi/ntlm ${.CURDIR}/../../../lib/libgssapi ${.CURDIR}/../libgssapi_krb5 +.PATH: ${KRB5DIR}/lib/gssapi/ntlm ${SRCTOP}/lib/libgssapi ${.CURDIR:H}/libgssapi_krb5 Index: head/kerberos5/lib/libgssapi_spnego/Makefile =================================================================== --- head/kerberos5/lib/libgssapi_spnego/Makefile (revision 314656) +++ head/kerberos5/lib/libgssapi_spnego/Makefile (revision 314657) @@ -1,58 +1,58 @@ # $FreeBSD$ LIB= gssapi_spnego LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined LIBADD= gssapi heimbase asn1 roken SHLIB_MAJOR= 10 SRCS= accept_sec_context.c \ compat.c \ context_stubs.c \ cred_stubs.c \ external.c \ init_sec_context.c \ freebsd_compat.c \ ${GEN:S/.x$/.c/:S/.hx$/.h/} \ gss_oid.c GEN= asn1_ContextFlags.x \ asn1_MechType.x \ asn1_MechTypeList.x \ asn1_NegotiationToken.x \ asn1_NegotiationTokenWin.x \ asn1_NegHints.x \ asn1_NegTokenInit.x \ asn1_NegTokenInitWin.x \ asn1_NegTokenResp.x \ spnego_asn1.hx \ spnego_asn1-priv.hx CFLAGS+=-I${KRB5DIR}/lib/gssapi CFLAGS+=-I${KRB5DIR}/lib/gssapi/gssapi CFLAGS+=-I${KRB5DIR}/lib/gssapi/spnego CFLAGS+=-I${KRB5DIR}/lib/asn1 -CFLAGS+=-I${.CURDIR}/../../../lib/libgssapi +CFLAGS+=-I${SRCTOP}/lib/libgssapi CFLAGS+=-I${KRB5DIR}/lib/roken -I. CLEANFILES= ${GEN} ${GEN:S/.x$/.c/:S/.hx$/.h/} \ spnego_asn1_files spnego_asn1-template.c .ORDER: ${GEN} ${GEN:[2..-1]}: .NOMETA ${GEN}: spnego.asn1 spnego.opt ${ASN1_COMPILE} --option-file=${.ALLSRC:M*.opt} \ ${.ALLSRC:M*.asn1} spnego_asn1 .SUFFIXES: .h .c .x .hx -.x.c: +.x.c: ${CP} ${.IMPSRC} ${.TARGET} .hx.h: ${CP} ${.IMPSRC} ${.TARGET} .include .SUFFIXES: .h .c .x .hx -.PATH: ${KRB5DIR}/lib/gssapi/spnego ${.CURDIR}/../../../lib/libgssapi ${.CURDIR}/../libgssapi_krb5 +.PATH: ${KRB5DIR}/lib/gssapi/spnego ${SRCTOP}/lib/libgssapi ${.CURDIR:H}/libgssapi_krb5 Index: head/kerberos5/lib/libhdb/Makefile =================================================================== --- head/kerberos5/lib/libhdb/Makefile (revision 314656) +++ head/kerberos5/lib/libhdb/Makefile (revision 314657) @@ -1,105 +1,105 @@ # $FreeBSD$ LIB= hdb LDFLAGS= -Wl,--no-undefined ${LDAPLDFLAGS} VERSION_MAP= ${KRB5DIR}/lib/hdb/version-script.map LIBADD= asn1 com_err krb5 roken sqlite3 LDADD= ${LDAPLDADD} DPADD= ${LDAPDPADD} MAN= HDB.3 hdb_entry_ex.3 MLINKS= HDB.3 hdb__del.3 \ HDB.3 hdb__get.3 \ HDB.3 hdb__put.3 \ HDB.3 hdb_auth_status.3 \ HDB.3 hdb_check_constrained_delegation.3 \ HDB.3 hdb_check_pkinit_ms_upn_match.3 \ HDB.3 hdb_check_s4u2self.3 \ HDB.3 hdb_close.3 \ HDB.3 hdb_destroy.3 \ HDB.3 hdb_fetch_kvno.3 \ HDB.3 hdb_firstkey.3 \ HDB.3 hdb_free.3 \ HDB.3 hdb_get_realms.3 \ HDB.3 hdb_lock.3 \ HDB.3 hdb_name.3 \ HDB.3 hdb_nextkey.3 \ HDB.3 hdb_open.3 \ HDB.3 hdb_password.3 \ HDB.3 hdb_remove.3 \ HDB.3 hdb_rename.3 \ HDB.3 hdb_store.3 \ HDB.3 hdb_unlock.3 INCS= hdb-protos.h \ hdb.h \ hdb_asn1.h \ hdb_err.h SRCS= common.c \ db.c \ db3.c \ dbinfo.c \ ext.c \ hdb-ldap.c \ hdb.c \ hdb_err.c \ hdb_err.h \ hdb-sqlite.c \ hdb-keytab.c \ hdb-mitdb.c \ keys.c \ keytab.c \ mkey.c \ ndbm.c \ print.c \ ${GEN:S/.x$/.c/:S/.hx$/.h/} CFLAGS+=-I${KRB5DIR}/lib/hdb -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/roken -I${.CURDIR}/../../../contrib/sqlite3/ \ + -I${KRB5DIR}/lib/roken -I${SRCTOP}/contrib/sqlite3/ \ -I${KRB5DIR}/lib/krb5 \ -I. ${LDAPCFLAGS} CFLAGS+=-DHDB_DB_DIR="\"/var/heimdal\"" GEN= asn1_Salt.x \ asn1_Key.x \ asn1_Event.x \ asn1_HDBFlags.x \ asn1_GENERATION.x \ asn1_HDB_Ext_PKINIT_acl.x \ asn1_HDB_Ext_PKINIT_cert.x \ asn1_HDB_Ext_PKINIT_hash.x \ asn1_HDB_Ext_Constrained_delegation_acl.x \ asn1_HDB_Ext_Lan_Manager_OWF.x \ asn1_HDB_Ext_Password.x \ asn1_HDB_Ext_Aliases.x \ asn1_HDB_extension.x \ asn1_HDB_extensions.x \ asn1_hdb_entry.x \ asn1_hdb_entry_alias.x \ asn1_hdb_keyset.x \ hdb_asn1.hx \ hdb_asn1-priv.hx CLEANFILES= ${GEN} ${GEN:S/.x$/.c/:S/.hx$/.h/} hdb_asn1_files \ hdb_asn1-template.[ch]* .ORDER: ${GEN} ${GEN:[2..-1]}: .NOMETA ${GEN}: hdb.asn1 ${ASN1_COMPILE} ${.ALLSRC:M*.asn1} hdb_asn1 .SUFFIXES: .h .c .x .hx .x.c: ${CP} ${.IMPSRC} ${.TARGET} .hx.h: ${CP} ${.IMPSRC} ${.TARGET} .include .SUFFIXES: .h .c .x .hx .PATH: ${KRB5DIR}/lib/hdb ${KRB5DIR}/doc/doxyout/hdb/man/man3/ Index: head/kerberos5/lib/libkafs5/Makefile =================================================================== --- head/kerberos5/lib/libkafs5/Makefile (revision 314656) +++ head/kerberos5/lib/libkafs5/Makefile (revision 314657) @@ -1,39 +1,39 @@ # $FreeBSD$ LIB= kafs5 LDFLAGS= -Wl,--no-undefined LIBADD= asn1 krb5 roken INCS= kafs.h MAN= kafs5.3 VERSION_MAP= ${.CURDIR}/version.map MLINKS= kafs5.3 k_afs_cell_of_file.3 \ kafs5.3 k_hasafs.3 \ kafs5.3 k_pioctl.3 \ kafs5.3 k_setpag.3 \ kafs5.3 k_unlog.3 \ kafs5.3 kafs.3 \ kafs5.3 kafs_set_verbose.3 \ kafs5.3 kafs_settoken.3 \ kafs5.3 kafs_settoken5.3 \ kafs5.3 kafs_settoken_rxkad.3 \ kafs5.3 krb5_afslog.3 \ kafs5.3 krb5_afslog_uid.3 \ kafs5.3 krb_afslog.3 \ kafs5.3 krb_afslog_uid.3 SRCS= afssys.c afskrb5.c common.c krb5_err.h CFLAGS+= -I${KRB5DIR}/lib/kafs \ -I${KRB5DIR}/lib/krb5 \ - -I${.OBJDIR}/../libkrb5/ \ + -I${.OBJDIR:H}/libkrb5/ \ -I${KRB5DIR}/lib/roken CLEANFILES= kafs5.3 kafs5.3: kafs.3 sed -e 's/libkafs, -lkafs/libkafs5, -lkafs5/g' ${.ALLSRC} >${.TARGET} .include .PATH: ${KRB5DIR}/lib/kafs Index: head/kerberos5/lib/libkrb5/Makefile =================================================================== --- head/kerberos5/lib/libkrb5/Makefile (revision 314656) +++ head/kerberos5/lib/libkrb5/Makefile (revision 314657) @@ -1,628 +1,628 @@ # $FreeBSD$ LIB= krb5 LDFLAGS= -Wl,--no-undefined VERSION_MAP= ${KRB5DIR}/lib/krb5/version-script.map LIBADD= asn1 com_err crypt crypto hx509 roken wind heimbase heimipcc INCS= heim_err.h \ heim_threads.h \ k524_err.h \ krb5-protos.h \ krb5-private.h \ krb5-types.h \ krb5.h \ krb5_err.h \ krb5_ccapi.h KRB5INCS= locate_plugin.h \ send_to_kdc_plugin.h \ ccache_plugin.h KRB5INCSDIR= ${INCLUDEDIR}/krb5 INCSGROUPS= INCS KRB5INCS MAN= krb5.3 \ krb524_convert_creds_kdc.3 \ krb5_425_conv_principal.3 \ krb5_acl_match_file.3 \ krb5_address.3 \ krb5_aname_to_localname.3 \ krb5_appdefault.3 \ krb5_auth.3 \ krb5_auth_context.3 \ krb5_c_make_checksum.3 \ krb5_ccache.3 \ krb5_ccache_intro.3 \ krb5_check_transited.3 \ krb5_create_checksum.3 \ krb5_credential.3 \ krb5_creds.3 \ krb5_crypto.3 \ krb5_crypto_iov.3 \ krb5_deprecated.3 \ krb5_digest.3 \ krb5_eai_to_heim_errno.3 \ krb5_encrypt.3 \ krb5_error.3 \ krb5_fileformats.3 \ krb5_find_padata.3 \ krb5_generate_random_block.3 \ krb5_get_all_client_addrs.3 \ krb5_get_credentials.3 \ krb5_get_creds.3 \ krb5_get_forwarded_creds.3 \ krb5_get_in_cred.3 \ krb5_get_init_creds.3 \ krb5_get_krbhst.3 \ krb5_getportbyname.3 \ krb5_init_context.3 \ krb5_init_creds_intro.3 \ krb5_introduction.3 \ krb5_is_thread_safe.3 \ krb5_keytab.3 \ krb5_keytab_intro.3 \ krb5_krbhst_init.3 \ krb5_mk_req.3 \ krb5_mk_safe.3 \ krb5_openlog.3 \ krb5_pac.3 \ krb5_parse_name.3 \ krb5_principal.3 \ krb5_principal_intro.3 \ krb5_rcache.3 \ krb5_rd_error.3 \ krb5_rd_safe.3 \ krb5_set_default_realm.3 \ krb5_set_password.3 \ krb5_storage.3 \ krb5_string_to_key.3 \ krb5_support.3 \ krb5_ticket.3 \ krb5_timeofday.3 \ krb5_v4compat.3 \ krb5_verify_init_creds.3 \ krb5_verify_user.3 MAN+= krb5.conf.5 MAN+= kerberos.8 MLINKS= krb5.3 krb5_add_et_list.3 \ krb5.3 krb5_add_extra_addresses.3 \ krb5.3 krb5_add_ignore_addresses.3 \ krb5.3 krb5_compare_creds.3 \ krb5.3 krb5_copy_context.3 \ krb5.3 krb5_copy_creds.3 \ krb5.3 krb5_copy_creds_contents.3 \ krb5.3 krb5_copy_data.3 \ krb5.3 krb5_copy_host_realm.3 \ krb5.3 krb5_copy_ticket.3 \ krb5.3 krb5_creds_get_ticket_flags.3 \ krb5.3 krb5_data_alloc.3 \ krb5.3 krb5_data_cmp.3 \ krb5.3 krb5_data_copy.3 \ krb5.3 krb5_data_ct_cmp.3 \ krb5.3 krb5_data_free.3 \ krb5.3 krb5_data_realloc.3 \ krb5.3 krb5_data_zero.3 \ krb5.3 krb5_free_config_files.3 \ krb5.3 krb5_free_cred_contents.3 \ krb5.3 krb5_free_creds.3 \ krb5.3 krb5_free_data.3 \ krb5.3 krb5_free_ticket.3 \ krb5.3 krb5_get_default_config_files.3 \ krb5.3 krb5_get_default_in_tkt_etypes.3 \ krb5.3 krb5_get_dns_canonicalize_hostname.3 \ krb5.3 krb5_get_extra_addresses.3 \ krb5.3 krb5_get_fcache_version.3 \ krb5.3 krb5_get_ignore_addresses.3 \ krb5.3 krb5_get_kdc_sec_offset.3 \ krb5.3 krb5_get_max_time_skew.3 \ krb5.3 krb5_get_use_admin_kdc.3 \ krb5.3 krb5_init_ets.3 \ krb5.3 krb5_kerberos_enctypes.3 \ krb5.3 krb5_prepend_config_files_default.3 \ krb5.3 krb5_set_config_files.3 \ krb5.3 krb5_set_default_in_tkt_etypes.3 \ krb5.3 krb5_set_dns_canonicalize_hostname.3 \ krb5.3 krb5_set_extra_addresses.3 \ krb5.3 krb5_set_fcache_version.3 \ krb5.3 krb5_set_home_dir_access.3 \ krb5.3 krb5_set_ignore_addresses.3 \ krb5.3 krb5_set_kdc_sec_offset.3 \ krb5.3 krb5_set_max_time_skew.3 \ krb5.3 krb5_set_real_time.3 \ krb5.3 krb5_set_use_admin_kdc.3 \ krb5.3 krb5_ticket_get_authorization_data_type.3 \ krb5.3 krb5_ticket_get_client.3 \ krb5.3 krb5_ticket_get_endtime.3 \ krb5.3 krb5_ticket_get_server.3 \ krb5_425_conv_principal.3 krb5_425_conv_principal_ext.3 \ krb5_425_conv_principal.3 krb5_524_conv_principal.3 \ krb5_address.3 krb5_addr2sockaddr.3 \ krb5_address.3 krb5_address_compare.3 \ krb5_address.3 krb5_address_order.3 \ krb5_address.3 krb5_address_prefixlen_boundary.3 \ krb5_address.3 krb5_address_search.3 \ krb5_address.3 krb5_anyaddr.3 \ krb5_address.3 krb5_append_addresses.3 \ krb5_address.3 krb5_copy_address.3 \ krb5_address.3 krb5_copy_addresses.3 \ krb5_address.3 krb5_free_address.3 \ krb5_address.3 krb5_free_addresses.3 \ krb5_address.3 krb5_h_addr2addr.3 \ krb5_address.3 krb5_h_addr2sockaddr.3 \ krb5_address.3 krb5_make_addrport.3 \ krb5_address.3 krb5_max_sockaddr_size.3 \ krb5_address.3 krb5_parse_address.3 \ krb5_address.3 krb5_print_address.3 \ krb5_address.3 krb5_sockaddr2address.3 \ krb5_address.3 krb5_sockaddr2port.3 \ krb5_address.3 krb5_sockaddr_uninteresting.3 \ krb5_appdefault.3 krb5_appdefault_boolean.3 \ krb5_appdefault.3 krb5_appdefault_string.3 \ krb5_appdefault.3 krb5_appdefault_time.3 \ krb5_auth.3 krb5_rd_req_ctx.3 \ krb5_auth.3 krb5_rd_req_in_ctx_alloc.3 \ krb5_auth.3 krb5_rd_req_in_set_keytab.3 \ krb5_auth.3 krb5_rd_req_in_set_pac_check.3 \ krb5_auth.3 krb5_rd_req_out_ctx_free.3 \ krb5_auth.3 krb5_rd_req_out_get_server.3 \ krb5_auth_context.3 krb5_auth_con_free.3 \ krb5_auth_context.3 krb5_auth_con_genaddrs.3 \ krb5_auth_context.3 krb5_auth_con_getaddrs.3 \ krb5_auth_context.3 krb5_auth_con_getflags.3 \ krb5_auth_context.3 krb5_auth_con_getkey.3 \ krb5_auth_context.3 krb5_auth_con_getlocalsubkey.3 \ krb5_auth_context.3 krb5_auth_con_getrcache.3 \ krb5_auth_context.3 krb5_auth_con_getremotesubkey.3 \ krb5_auth_context.3 krb5_auth_con_getuserkey.3 \ krb5_auth_context.3 krb5_auth_con_init.3 \ krb5_auth_context.3 krb5_auth_con_initivector.3 \ krb5_auth_context.3 krb5_auth_con_setaddrs.3 \ krb5_auth_context.3 krb5_auth_con_setaddrs_from_fd.3 \ krb5_auth_context.3 krb5_auth_con_setflags.3 \ krb5_auth_context.3 krb5_auth_con_setivector.3 \ krb5_auth_context.3 krb5_auth_con_setkey.3 \ krb5_auth_context.3 krb5_auth_con_setlocalsubkey.3 \ krb5_auth_context.3 krb5_auth_con_setrcache.3 \ krb5_auth_context.3 krb5_auth_con_setremotesubkey.3 \ krb5_auth_context.3 krb5_auth_con_setuserkey.3 \ krb5_auth_context.3 krb5_auth_getauthenticator.3 \ krb5_auth_context.3 krb5_auth_getcksumtype.3 \ krb5_auth_context.3 krb5_auth_getkeytype.3 \ krb5_auth_context.3 krb5_auth_getlocalseqnumber.3 \ krb5_auth_context.3 krb5_auth_setcksumtype.3 \ krb5_auth_context.3 krb5_auth_setkeytype.3 \ krb5_auth_context.3 krb5_auth_setlocalseqnumber.3 \ krb5_auth_context.3 krb5_auth_setremoteseqnumber.3 \ krb5_ccache.3 krb5_acc_ops.3 \ krb5_ccache.3 krb5_cc_cache_end_seq_get.3 \ krb5_ccache.3 krb5_cc_cache_get_first.3 \ krb5_ccache.3 krb5_cc_cache_match.3 \ krb5_ccache.3 krb5_cc_cache_next.3 \ krb5_ccache.3 krb5_cc_clear_mcred.3 \ krb5_ccache.3 krb5_cc_close.3 \ krb5_ccache.3 krb5_cc_copy_cache.3 \ krb5_ccache.3 krb5_cc_copy_creds.3 \ krb5_ccache.3 krb5_cc_copy_match_f.3 \ krb5_ccache.3 krb5_cc_default.3 \ krb5_ccache.3 krb5_cc_default_name.3 \ krb5_ccache.3 krb5_cc_destroy.3 \ krb5_ccache.3 krb5_cc_end_seq_get.3 \ krb5_ccache.3 krb5_cc_gen_new.3 \ krb5_ccache.3 krb5_cc_get_config.3 \ krb5_ccache.3 krb5_cc_get_flags.3 \ krb5_ccache.3 krb5_cc_get_friendly_name.3 \ krb5_ccache.3 krb5_cc_get_full_name.3 \ krb5_ccache.3 krb5_cc_get_kdc_offset.3 \ krb5_ccache.3 krb5_cc_get_lifetime.3 \ krb5_ccache.3 krb5_cc_get_name.3 \ krb5_ccache.3 krb5_cc_get_ops.3 \ krb5_ccache.3 krb5_cc_get_prefix_ops.3 \ krb5_ccache.3 krb5_cc_get_principal.3 \ krb5_ccache.3 krb5_cc_get_type.3 \ krb5_ccache.3 krb5_cc_get_version.3 \ krb5_ccache.3 krb5_cc_initialize.3 \ krb5_ccache.3 krb5_cc_last_change_time.3 \ krb5_ccache.3 krb5_cc_move.3 \ krb5_ccache.3 krb5_cc_new_unique.3 \ krb5_ccache.3 krb5_cc_next_cred.3 \ krb5_ccache.3 krb5_cc_register.3 \ krb5_ccache.3 krb5_cc_remove_cred.3 \ krb5_ccache.3 krb5_cc_resolve.3 \ krb5_ccache.3 krb5_cc_retrieve_cred.3 \ krb5_ccache.3 krb5_cc_set_config.3 \ krb5_ccache.3 krb5_cc_set_default_name.3 \ krb5_ccache.3 krb5_cc_set_flags.3 \ krb5_ccache.3 krb5_cc_set_friendly_name.3 \ krb5_ccache.3 krb5_cc_set_kdc_offset.3 \ krb5_ccache.3 krb5_cc_start_seq_get.3 \ krb5_ccache.3 krb5_cc_store_cred.3 \ krb5_ccache.3 krb5_cc_support_switch.3 \ krb5_ccache.3 krb5_cc_switch.3 \ krb5_ccache.3 krb5_cccol_cursor_free.3 \ krb5_ccache.3 krb5_cccol_cursor_new.3 \ krb5_ccache.3 krb5_cccol_cursor_next.3 \ krb5_ccache.3 krb5_cccol_last_change_time.3 \ krb5_ccache.3 krb5_fcc_ops.3 \ krb5_ccache.3 krb5_get_validated_creds.3 \ krb5_ccache.3 krb5_is_config_principal.3 \ krb5_ccache.3 krb5_mcc_ops.3 \ krb5_create_checksum.3 krb5_checksum_is_collision_proof.3 \ krb5_create_checksum.3 krb5_checksum_is_keyed.3 \ krb5_create_checksum.3 krb5_checksumsize.3 \ krb5_create_checksum.3 krb5_verify_checksum.3 \ krb5_credential.3 krb5_fwd_tgt_creds.3 \ krb5_credential.3 krb5_get_init_creds_keyblock.3 \ krb5_credential.3 krb5_get_init_creds_keytab.3 \ krb5_credential.3 krb5_get_init_creds_opt_alloc.3 \ krb5_credential.3 krb5_get_init_creds_opt_free.3 \ krb5_credential.3 krb5_get_init_creds_password.3 \ krb5_credential.3 krb5_init_creds_free.3 \ krb5_credential.3 krb5_init_creds_get.3 \ krb5_credential.3 krb5_init_creds_get_error.3 \ krb5_credential.3 krb5_init_creds_init.3 \ krb5_credential.3 krb5_init_creds_set_keytab.3 \ krb5_credential.3 krb5_init_creds_set_password.3 \ krb5_credential.3 krb5_init_creds_set_service.3 \ krb5_credential.3 krb5_init_creds_step.3 \ krb5_crypto.3 krb5_allow_weak_crypto.3 \ krb5_crypto.3 krb5_cksumtype_to_enctype.3 \ krb5_crypto.3 krb5_copy_keyblock.3 \ krb5_crypto.3 krb5_copy_keyblock_contents.3 \ krb5_crypto.3 krb5_create_checksum_iov.3 \ krb5_crypto.3 krb5_crypto_destroy.3 \ krb5_crypto.3 krb5_crypto_fx_cf2.3 \ krb5_crypto.3 krb5_crypto_getblocksize.3 \ krb5_crypto.3 krb5_crypto_getconfoundersize.3 \ krb5_crypto.3 krb5_crypto_getenctype.3 \ krb5_crypto.3 krb5_crypto_getpadsize.3 \ krb5_crypto.3 krb5_crypto_init.3 \ krb5_crypto.3 krb5_decrypt_iov_ivec.3 \ krb5_crypto.3 krb5_encrypt_iov_ivec.3 \ krb5_crypto.3 krb5_enctype_disable.3 \ krb5_crypto.3 krb5_enctype_enable.3 \ krb5_crypto.3 krb5_enctype_valid.3 \ krb5_crypto.3 krb5_free_keyblock.3 \ krb5_crypto.3 krb5_free_keyblock_contents.3 \ krb5_crypto.3 krb5_generate_subkey_extended.3 \ krb5_crypto.3 krb5_keyblock_get_enctype.3 \ krb5_crypto.3 krb5_keyblock_init.3 \ krb5_crypto.3 krb5_keyblock_zero.3 \ krb5_crypto.3 krb5_random_to_key.3 \ krb5_crypto.3 krb5_verify_checksum_iov.3 \ krb5_deprecated.3 krb5_auth_getremoteseqnumber.3 \ krb5_deprecated.3 krb5_c_enctype_compare.3 \ krb5_deprecated.3 krb5_change_password.3 \ krb5_deprecated.3 krb5_clear_error_string.3 \ krb5_deprecated.3 krb5_config_parse_string_multi.3 \ krb5_deprecated.3 krb5_enctypes_compatible_keys.3 \ krb5_deprecated.3 krb5_free_creds_contents.3 \ krb5_deprecated.3 krb5_free_data_contents.3 \ krb5_deprecated.3 krb5_free_error_string.3 \ krb5_deprecated.3 krb5_free_unparsed_name.3 \ krb5_deprecated.3 krb5_generate_subkey.3 \ krb5_deprecated.3 krb5_get_cred_from_kdc.3 \ krb5_deprecated.3 krb5_get_cred_from_kdc_opt.3 \ krb5_deprecated.3 krb5_get_in_tkt_with_keytab.3 \ krb5_deprecated.3 krb5_get_in_tkt_with_password.3 \ krb5_deprecated.3 krb5_get_in_tkt_with_skey.3 \ krb5_deprecated.3 krb5_get_init_creds_opt_get_error.3 \ krb5_deprecated.3 krb5_get_init_creds_opt_init.3 \ krb5_deprecated.3 krb5_keytab_key_proc.3 \ krb5_deprecated.3 krb5_keytype_to_enctypes.3 \ krb5_deprecated.3 krb5_keytype_to_enctypes_default.3 \ krb5_deprecated.3 krb5_keytype_to_string.3 \ krb5_deprecated.3 krb5_password_key_proc.3 \ krb5_deprecated.3 krb5_princ_realm.3 \ krb5_deprecated.3 krb5_princ_set_realm.3 \ krb5_deprecated.3 krb5_set_error_string.3 \ krb5_deprecated.3 krb5_string_to_keytype.3 \ krb5_deprecated.3 krb5_vset_error_string.3 \ krb5_digest.3 krb5_digest_probe.3 \ krb5_encrypt.3 krb5_decrypt.3 \ krb5_encrypt.3 krb5_decrypt_EncryptedData.3 \ krb5_encrypt.3 krb5_encrypt_EncryptedData.3 \ krb5_error.3 krb5_clear_error_message.3 \ krb5_error.3 krb5_h_errno_to_heim_errno.3 \ krb5_error.3 krb5_set_error_message.3 \ krb5_error.3 krb5_vwarn.3 \ krb5_get_all_client_addrs.3 krb5_get_all_server_addrs.3 \ krb5_get_krbhst.3 krb5_free_krbhst.3 \ krb5_get_krbhst.3 krb5_get_krb524hst.3 \ krb5_get_krbhst.3 krb5_get_krb_admin_hst.3 \ krb5_get_krbhst.3 krb5_get_krb_changepw_hst.3 \ krb5_init_context.3 krb5_free_context.3 \ krb5_keytab.3 krb5_kt_add_entry.3 \ krb5_keytab.3 krb5_kt_close.3 \ krb5_keytab.3 krb5_kt_compare.3 \ krb5_keytab.3 krb5_kt_copy_entry_contents.3 \ krb5_keytab.3 krb5_kt_default.3 \ krb5_keytab.3 krb5_kt_default_modify_name.3 \ krb5_keytab.3 krb5_kt_default_name.3 \ krb5_keytab.3 krb5_kt_destroy.3 \ krb5_keytab.3 krb5_kt_end_seq_get.3 \ krb5_keytab.3 krb5_kt_free_entry.3 \ krb5_keytab.3 krb5_kt_get_entry.3 \ krb5_keytab.3 krb5_kt_get_full_name.3 \ krb5_keytab.3 krb5_kt_get_name.3 \ krb5_keytab.3 krb5_kt_get_type.3 \ krb5_keytab.3 krb5_kt_have_content.3 \ krb5_keytab.3 krb5_kt_next_entry.3 \ krb5_keytab.3 krb5_kt_read_service_key.3 \ krb5_keytab.3 krb5_kt_register.3 \ krb5_keytab.3 krb5_kt_remove_entry.3 \ krb5_keytab.3 krb5_kt_resolve.3 \ krb5_keytab.3 krb5_kt_start_seq_get.3 \ krb5_krbhst_init.3 krb5_krbhst_format_string.3 \ krb5_krbhst_init.3 krb5_krbhst_free.3 \ krb5_krbhst_init.3 krb5_krbhst_get_addrinfo.3 \ krb5_krbhst_init.3 krb5_krbhst_next.3 \ krb5_krbhst_init.3 krb5_krbhst_next_as_string.3 \ krb5_krbhst_init.3 krb5_krbhst_reset.3 \ krb5_openlog.3 krb5_addlog_dest.3 \ krb5_openlog.3 krb5_addlog_func.3 \ krb5_openlog.3 krb5_closelog.3 \ krb5_openlog.3 krb5_initlog.3 \ krb5_openlog.3 krb5_log.3 \ krb5_openlog.3 krb5_log_msg.3 \ krb5_openlog.3 krb5_vlog.3 \ krb5_openlog.3 krb5_vlog_msg.3 \ krb5_pac.3 krb5_pac_get_buffer.3 \ krb5_pac.3 krb5_pac_verify.3 \ krb5_principal.3 krb5_build_principal.3 \ krb5_principal.3 krb5_build_principal_ext.3 \ krb5_principal.3 krb5_build_principal_va.3 \ krb5_principal.3 krb5_build_principal_va_ext.3 \ krb5_principal.3 krb5_copy_principal.3 \ krb5_principal.3 krb5_free_principal.3 \ krb5_principal.3 krb5_get_default_principal.3 \ krb5_principal.3 krb5_make_principal.3 \ krb5_principal.3 krb5_parse_name_flags.3 \ krb5_principal.3 krb5_parse_nametype.3 \ krb5_principal.3 krb5_principal_compare.3 \ krb5_principal.3 krb5_principal_compare_any_realm.3 \ krb5_principal.3 krb5_principal_get_comp_string.3 \ krb5_principal.3 krb5_principal_get_num_comp.3 \ krb5_principal.3 krb5_principal_get_realm.3 \ krb5_principal.3 krb5_principal_get_type.3 \ krb5_principal.3 krb5_principal_is_krbtgt.3 \ krb5_principal.3 krb5_principal_match.3 \ krb5_principal.3 krb5_principal_set_realm.3 \ krb5_principal.3 krb5_principal_set_type.3 \ krb5_principal.3 krb5_realm_compare.3 \ krb5_principal.3 krb5_sname_to_principal.3 \ krb5_principal.3 krb5_sock_to_principal.3 \ krb5_principal.3 krb5_unparse_name.3 \ krb5_principal.3 krb5_unparse_name_fixed.3 \ krb5_principal.3 krb5_unparse_name_fixed_flags.3 \ krb5_principal.3 krb5_unparse_name_fixed_short.3 \ krb5_principal.3 krb5_unparse_name_flags.3 \ krb5_principal.3 krb5_unparse_name_short.3 \ krb5_set_default_realm.3 krb5_free_host_realm.3 \ krb5_set_default_realm.3 krb5_get_default_realm.3 \ krb5_set_default_realm.3 krb5_get_default_realms.3 \ krb5_set_default_realm.3 krb5_get_host_realm.3 \ krb5_storage.3 krb5_ret_address.3 \ krb5_storage.3 krb5_ret_addrs.3 \ krb5_storage.3 krb5_ret_authdata.3 \ krb5_storage.3 krb5_ret_creds.3 \ krb5_storage.3 krb5_ret_creds_tag.3 \ krb5_storage.3 krb5_ret_data.3 \ krb5_storage.3 krb5_ret_int16.3 \ krb5_storage.3 krb5_ret_int32.3 \ krb5_storage.3 krb5_ret_int8.3 \ krb5_storage.3 krb5_ret_keyblock.3 \ krb5_storage.3 krb5_ret_principal.3 \ krb5_storage.3 krb5_ret_string.3 \ krb5_storage.3 krb5_ret_stringz.3 \ krb5_storage.3 krb5_ret_times.3 \ krb5_storage.3 krb5_ret_uint16.3 \ krb5_storage.3 krb5_ret_uint32.3 \ krb5_storage.3 krb5_ret_uint8.3 \ krb5_storage.3 krb5_storage_clear_flags.3 \ krb5_storage.3 krb5_storage_emem.3 \ krb5_storage.3 krb5_storage_free.3 \ krb5_storage.3 krb5_storage_from_data.3 \ krb5_storage.3 krb5_storage_from_fd.3 \ krb5_storage.3 krb5_storage_from_mem.3 \ krb5_storage.3 krb5_storage_from_readonly_mem.3 \ krb5_storage.3 krb5_storage_get_byteorder.3 \ krb5_storage.3 krb5_storage_get_eof_code.3 \ krb5_storage.3 krb5_storage_is_flags.3 \ krb5_storage.3 krb5_storage_read.3 \ krb5_storage.3 krb5_storage_seek.3 \ krb5_storage.3 krb5_storage_set_byteorder.3 \ krb5_storage.3 krb5_storage_set_eof_code.3 \ krb5_storage.3 krb5_storage_set_flags.3 \ krb5_storage.3 krb5_storage_set_max_alloc.3 \ krb5_storage.3 krb5_storage_to_data.3 \ krb5_storage.3 krb5_storage_truncate.3 \ krb5_storage.3 krb5_storage_write.3 \ krb5_storage.3 krb5_store_address.3 \ krb5_storage.3 krb5_store_addrs.3 \ krb5_storage.3 krb5_store_authdata.3 \ krb5_storage.3 krb5_store_creds.3 \ krb5_storage.3 krb5_store_creds_tag.3 \ krb5_storage.3 krb5_store_data.3 \ krb5_storage.3 krb5_store_int16.3 \ krb5_storage.3 krb5_store_int32.3 \ krb5_storage.3 krb5_store_int8.3 \ krb5_storage.3 krb5_store_keyblock.3 \ krb5_storage.3 krb5_store_principal.3 \ krb5_storage.3 krb5_store_string.3 \ krb5_storage.3 krb5_store_stringz.3 \ krb5_storage.3 krb5_store_times.3 \ krb5_storage.3 krb5_store_uint16.3 \ krb5_storage.3 krb5_store_uint32.3 \ krb5_storage.3 krb5_store_uint8.3 \ krb5_support.3 krb5_acl_match_string.3 \ krb5_support.3 krb5_config_file_free.3 \ krb5_support.3 krb5_config_free_strings.3 \ krb5_support.3 krb5_config_get_bool.3 \ krb5_support.3 krb5_config_get_bool_default.3 \ krb5_support.3 krb5_config_get_list.3 \ krb5_support.3 krb5_config_get_string.3 \ krb5_support.3 krb5_config_get_string_default.3 \ krb5_support.3 krb5_config_get_strings.3 \ krb5_support.3 krb5_config_get_time.3 \ krb5_support.3 krb5_config_get_time_default.3 \ krb5_support.3 krb5_config_parse_file_multi.3 \ krb5_support.3 krb5_config_vget_bool.3 \ krb5_support.3 krb5_config_vget_bool_default.3 \ krb5_support.3 krb5_config_vget_list.3 \ krb5_support.3 krb5_config_vget_string.3 \ krb5_support.3 krb5_config_vget_string_default.3 \ krb5_support.3 krb5_config_vget_strings.3 \ krb5_support.3 krb5_config_vget_time.3 \ krb5_support.3 krb5_config_vget_time_default.3 \ krb5_support.3 krb5_expand_hostname.3 \ krb5_support.3 krb5_expand_hostname_realms.3 \ krb5_support.3 krb5_kuserok.3 \ krb5_support.3 krb5_plugin_register.3 \ krb5_ticket.3 krb5_ticket_get_flags.3 \ krb5_timeofday.3 krb5_us_timeofday.3 \ krb5_v4compat.3 krb524_convert_creds_kdc_ccache.3 \ krb5_verify_user.3 krb5_verify_opt_init.3 \ krb5_verify_user.3 krb5_verify_opt_set_flags.3 \ krb5_verify_user.3 krb5_verify_opt_set_keytab.3 \ krb5_verify_user.3 krb5_verify_opt_set_secure.3 \ krb5_verify_user.3 krb5_verify_opt_set_service.3 \ krb5_verify_user.3 krb5_verify_user_lrealm.3 \ krb5_verify_user.3 krb5_verify_user_opt.3 SRCS= acache.c \ acl.c \ add_et_list.c \ addr_families.c \ aname_to_localname.c \ appdefault.c \ asn1_glue.c \ auth_context.c \ build_ap_req.c \ build_auth.c \ cache.c \ changepw.c \ codec.c \ config_file.c \ constants.c \ context.c \ convert_creds.c \ copy_host_realm.c \ crc.c \ creds.c \ crypto-aes.c \ crypto-algs.c \ crypto-arcfour.c \ crypto-des-common.c \ crypto-des.c \ crypto-des3.c \ crypto-evp.c \ crypto-null.c \ crypto-pk.c \ crypto-rand.c \ crypto.c \ data.c \ deprecated.c \ digest.c \ doxygen.c \ eai_to_heim_errno.c \ error_string.c \ expand_hostname.c \ expand_path.c \ fcache.c \ free.c \ free_host_realm.c \ generate_seq_number.c \ generate_subkey.c \ get_addrs.c \ get_cred.c \ get_default_principal.c \ get_default_realm.c \ get_for_creds.c \ get_host_realm.c \ get_in_tkt.c \ get_port.c \ init_creds.c \ init_creds_pw.c \ kcm.c \ keyblock.c \ keytab.c \ keytab_any.c \ keytab_file.c \ keytab_keyfile.c \ keytab_memory.c \ krbhst.c \ kuserok.c \ log.c \ mcache.c \ misc.c \ mit_glue.c \ mk_error.c \ mk_priv.c \ mk_rep.c \ mk_req.c \ mk_req_ext.c \ mk_safe.c \ n-fold.c \ net_read.c \ net_write.c \ pac.c \ padata.c \ pcache.c \ pkinit.c \ plugin.c \ principal.c \ prog_setup.c \ prompter_posix.c \ rd_cred.c \ rd_error.c \ rd_priv.c \ rd_rep.c \ rd_req.c \ rd_safe.c \ read_message.c \ recvauth.c \ replay.c \ salt-aes.c \ salt-arcfour.c \ salt-des.c \ salt-des3.c \ salt.c \ scache.c \ send_to_kdc.c \ sendauth.c \ set_default_realm.c \ sock_principal.c \ store-int.c \ store.c \ store_emem.c \ store_fd.c \ store_mem.c \ ticket.c \ time.c \ transited.c \ verify_init.c \ verify_user.c \ version.c \ warn.c \ write_message.c SRCS+= heim_err.c \ heim_err.h \ k524_err.c \ k524_err.h \ krb5_err.c \ krb5_err.h \ krb_err.c \ krb_err.h CFLAGS+= -I${KRB5DIR}/lib/krb5 \ -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/lib/ipc \ -I${KRB5DIR}/base -I. .include -.PATH: ${KRB5DIR}/lib/krb5 ${KRB5DIR}/lib/asn1 ${KRB5DIR}/include ${.CURDIR}/../../include ${KRB5DIR}/doc/doxyout/krb5/man/man3/ +.PATH: ${KRB5DIR}/lib/krb5 ${KRB5DIR}/lib/asn1 ${KRB5DIR}/include ${SRCTOP}/kerberos5/include ${KRB5DIR}/doc/doxyout/krb5/man/man3/ Index: head/kerberos5/libexec/hprop/Makefile =================================================================== --- head/kerberos5/libexec/hprop/Makefile (revision 314656) +++ head/kerberos5/libexec/hprop/Makefile (revision 314657) @@ -1,20 +1,20 @@ # $FreeBSD$ PROG= hprop MAN= hprop.8 SRCS= hprop.c mit_dump.c CFLAGS+=-I${KRB5DIR}/lib/roken CFLAGS+=-I${KRB5DIR}/lib/krb5 CFLAGS+=-I${KRB5DIR}/lib/asn1 CFLAGS+=-I${KRB5DIR}/lib/hx509 CFLAGS+=-I${KRB5DIR}/lib/ntlm CFLAGS+=-I${KRB5DIR}/kdc -CFLAGS+=-I${.OBJDIR}/../../lib/libkrb5 +CFLAGS+=-I${.OBJDIR:H:H}/lib/libkrb5 LIBADD= hdb krb5 roken vers DPADD= ${LDAPDPADD} LDADD= ${LDAPLDADD} LDFLAGS=${LDAPLDFLAGS} .include .PATH: ${KRB5DIR}/kdc Index: head/kerberos5/libexec/kpasswdd/Makefile =================================================================== --- head/kerberos5/libexec/kpasswdd/Makefile (revision 314656) +++ head/kerberos5/libexec/kpasswdd/Makefile (revision 314657) @@ -1,13 +1,13 @@ # $FreeBSD$ PROG= kpasswdd MAN= kpasswdd.8 -CFLAGS+=-I${KRB5DIR}/lib/roken -I../../lib/libhdb ${LDAPCFLAGS} +CFLAGS+=-I${KRB5DIR}/lib/roken -I${.CURDIR:H:H}/lib/libhdb ${LDAPCFLAGS} LIBADD= kadm5srv hdb krb5 roken vers asn1 DPADD= ${LDAPDPADD} LDADD= ${LDAPLDADD} LDFLAGS=${LDAPLDFLAGS} .include .PATH: ${KRB5DIR}/kpasswd Index: head/kerberos5/tools/asn1_compile/Makefile =================================================================== --- head/kerberos5/tools/asn1_compile/Makefile (revision 314656) +++ head/kerberos5/tools/asn1_compile/Makefile (revision 314657) @@ -1,36 +1,36 @@ # $FreeBSD$ PROG= asn1_compile MAN= -LIBROKEN_A= ${.OBJDIR}/../../lib/libroken/libroken.a +LIBROKEN_A= ${.OBJDIR:H:H}/lib/libroken/libroken.a LIBADD= vers LDADD= ${LIBROKEN_A} DPADD= ${LIBROKEN_A} SRCS= \ asn1parse.y \ gen.c \ gen_copy.c \ gen_decode.c \ gen_encode.c \ gen_free.c \ gen_glue.c \ gen_length.c \ gen_seq.c \ gen_template.c \ hash.c \ lex.l \ main.c \ roken.h \ symbol.c CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/asn1 -I. CLEANFILES= roken.h lex.c parse.c roken.h: make-roken > ${.TARGET} .include .PATH: ${KRB5DIR}/lib/asn1 Index: head/kerberos5/tools/slc/Makefile =================================================================== --- head/kerberos5/tools/slc/Makefile (revision 314656) +++ head/kerberos5/tools/slc/Makefile (revision 314657) @@ -1,25 +1,25 @@ # $FreeBSD$ PROG= slc -LIBROKEN_A= ${.OBJDIR}/../../lib/libroken/libroken.a +LIBROKEN_A= ${.OBJDIR:H:H}/lib/libroken/libroken.a LIBADD= vers LDADD= ${LIBROKEN_A} DPADD= ${LIBROKEN_A} MAN= SRCS= roken.h \ slc-gram.y \ slc-lex.l CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/sl -I${KRB5DIR}/lib/vers -I. CLEANFILES= roken.h slc-gram.c slc-lex.c roken.h: ${MAKE_ROKEN} > ${.TARGET} -# ${.OBJDIR}/../make-roken/make-roken > ${.TARGET} +# ${.OBJDIR:H}/make-roken/make-roken > ${.TARGET} .include .PATH: ${KRB5DIR}/lib/roken ${KRB5DIR}/lib/sl