kerberos5: normalize paths using SRCTOP-relative paths or :H when possible

This simplifies make logic/output

MFC after:	1 month
Sponsored by:	Dell EMC Isilon

12 files changed, 17 insertions, 17 deletions

diff --git a/kerberos5/Makefile b/kerberos5/Makefile
index e78084f6d1615..70626daa6a1a5 100644
--- a/kerberos5/Makefile
+++ b/kerberos5/Makefile
@@ -11,7 +11,7 @@ KPROGS=	lib/libpam \
 # 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; \
@@ -21,7 +21,7 @@ kerberize:
 # 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; \
diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc
index 4abf68b9d0d1e..eeb8d3a20bbab 100644
--- a/kerberos5/Makefile.inc
+++ b/kerberos5/Makefile.inc
@@ -4,9 +4,9 @@
 
 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
diff --git a/kerberos5/lib/libgssapi_krb5/Makefile b/kerberos5/lib/libgssapi_krb5/Makefile
index 6116767e45a40..905b824d0a575 100644
--- a/kerberos5/lib/libgssapi_krb5/Makefile
+++ b/kerberos5/lib/libgssapi_krb5/Makefile
@@ -82,4 +82,4 @@ CFLAGS+=-I${KRB5DIR}/lib/roken -I.
 
 .include <bsd.lib.mk>
 
-.PATH: ${KRB5DIR}/lib/gssapi/krb5 ${.CURDIR}/../../../lib/libgssapi
+.PATH: ${KRB5DIR}/lib/gssapi/krb5 ${SRCTOP}/lib/libgssapi
diff --git a/kerberos5/lib/libgssapi_ntlm/Makefile b/kerberos5/lib/libgssapi_ntlm/Makefile
index ac546f716642a..b5edb08a8d47c 100644
--- a/kerberos5/lib/libgssapi_ntlm/Makefile
+++ b/kerberos5/lib/libgssapi_ntlm/Makefile
@@ -45,4 +45,4 @@ CFLAGS+=-I${KRB5DIR}/lib/ntlm
 
 .include <bsd.lib.mk>
 
-.PATH: ${KRB5DIR}/lib/gssapi/ntlm ${.CURDIR}/../../../lib/libgssapi ${.CURDIR}/../libgssapi_krb5
+.PATH: ${KRB5DIR}/lib/gssapi/ntlm ${SRCTOP}/lib/libgssapi ${.CURDIR:H}/libgssapi_krb5
diff --git a/kerberos5/lib/libgssapi_spnego/Makefile b/kerberos5/lib/libgssapi_spnego/Makefile
index 41e2a6425d2ab..1ccf1377e8bca 100644
--- a/kerberos5/lib/libgssapi_spnego/Makefile
+++ b/kerberos5/lib/libgssapi_spnego/Makefile
@@ -31,7 +31,7 @@ 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/} \
@@ -45,7 +45,7 @@ ${GEN}: spnego.asn1 spnego.opt
 
 .SUFFIXES: .h .c .x .hx
 
-.x.c:   
+.x.c:
 	${CP} ${.IMPSRC} ${.TARGET}
 
 .hx.h:
@@ -55,4 +55,4 @@ ${GEN}: spnego.asn1 spnego.opt
 
 .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
diff --git a/kerberos5/lib/libhdb/Makefile b/kerberos5/lib/libhdb/Makefile
index 2507ee62002ce..df67359404c62 100644
--- a/kerberos5/lib/libhdb/Makefile
+++ b/kerberos5/lib/libhdb/Makefile
@@ -57,7 +57,7 @@ SRCS=	common.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\""
diff --git a/kerberos5/lib/libkafs5/Makefile b/kerberos5/lib/libkafs5/Makefile
index 6b7a4cda6d7a3..dbce7f280b512 100644
--- a/kerberos5/lib/libkafs5/Makefile
+++ b/kerberos5/lib/libkafs5/Makefile
@@ -26,7 +26,7 @@ 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
diff --git a/kerberos5/lib/libkrb5/Makefile b/kerberos5/lib/libkrb5/Makefile
index a1999ccf3e63e..0eac57c803f09 100644
--- a/kerberos5/lib/libkrb5/Makefile
+++ b/kerberos5/lib/libkrb5/Makefile
@@ -625,4 +625,4 @@ CFLAGS+=	-I${KRB5DIR}/lib/krb5 \
 
 .include <bsd.lib.mk>
 
-.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/
diff --git a/kerberos5/libexec/hprop/Makefile b/kerberos5/libexec/hprop/Makefile
index 88f3dadcff71b..b267571315f24 100644
--- a/kerberos5/libexec/hprop/Makefile
+++ b/kerberos5/libexec/hprop/Makefile
@@ -9,7 +9,7 @@ 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}
diff --git a/kerberos5/libexec/kpasswdd/Makefile b/kerberos5/libexec/kpasswdd/Makefile
index 2fe79646aae6f..81836a81ecd9b 100644
--- a/kerberos5/libexec/kpasswdd/Makefile
+++ b/kerberos5/libexec/kpasswdd/Makefile
@@ -2,7 +2,7 @@
 
 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}
diff --git a/kerberos5/tools/asn1_compile/Makefile b/kerberos5/tools/asn1_compile/Makefile
index 54c2fdf81967f..68715facfcbd8 100644
--- a/kerberos5/tools/asn1_compile/Makefile
+++ b/kerberos5/tools/asn1_compile/Makefile
@@ -2,7 +2,7 @@
 
 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}
diff --git a/kerberos5/tools/slc/Makefile b/kerberos5/tools/slc/Makefile
index cabd5893884c7..34092a566443e 100644
--- a/kerberos5/tools/slc/Makefile
+++ b/kerberos5/tools/slc/Makefile
@@ -1,7 +1,7 @@
 # $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}
@@ -18,7 +18,7 @@ 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 <bsd.prog.mk>