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

This simplifies make logic/output

MFC after:	1 month
Sponsored by:	Dell EMC Isilon

11 files changed, 16 insertions, 17 deletions

diff --git a/libexec/atrun/Makefile b/libexec/atrun/Makefile
index b11e2e92dcbf..18f89191d399 100644
--- a/libexec/atrun/Makefile
+++ b/libexec/atrun/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PACKAGE=at
-MAINSRC=${.CURDIR}/../../usr.bin/at
+MAINSRC=${SRCTOP}/usr.bin/at
 
 .include "${MAINSRC}/Makefile.inc"
 
diff --git a/libexec/dma/Makefile.inc b/libexec/dma/Makefile.inc
index b24f85d7044c..8e88f832ee99 100644
--- a/libexec/dma/Makefile.inc
+++ b/libexec/dma/Makefile.inc
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
-.sinclude "${.CURDIR}/../../Makefile.inc"
-DMA_SOURCES=	${.CURDIR}/../../../contrib/dma
+.sinclude "${.CURDIR:H:H}/Makefile.inc"
+DMA_SOURCES=	${SRCTOP}/contrib/dma
 .PATH:	${DMA_SOURCES}
 
 CFLAGS+= -I${DMA_SOURCES} \
diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile
index b945e55d7988..7d6f5bde445e 100644
--- a/libexec/ftpd/Makefile
+++ b/libexec/ftpd/Makefile
@@ -18,10 +18,9 @@ LIBADD=	crypt xo util
 # XXX Kluge! Conversation mechanism needs to be fixed.
 LIBADD+=	opie md
 
-LSDIR=	../../bin/ls
-.PATH:	${.CURDIR}/${LSDIR}
+.PATH:	${SRCTOP}/bin/ls
 SRCS+=	ls.c cmp.c print.c util.c
-CFLAGS+=-Dmain=ls_main -I${.CURDIR}/${LSDIR}
+CFLAGS+=-Dmain=ls_main -I${SRCTOP}/bin/ls
 LIBADD+=	m
 
 .if ${MK_BLACKLIST_SUPPORT} != "no"
diff --git a/libexec/hyperv/Makefile b/libexec/hyperv/Makefile
index a8414771d8ab..a89b7435d2e5 100644
--- a/libexec/hyperv/Makefile
+++ b/libexec/hyperv/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH:		${.CURDIR}/../../contrib/hyperv/tools/scripts
+.PATH:		${SRCTOP}/contrib/hyperv/tools/scripts
 
 BINDIR=		${LIBEXECDIR}/hyperv
 
diff --git a/libexec/mail.local/Makefile b/libexec/mail.local/Makefile
index 6b4256f8a091..a642326228b2 100644
--- a/libexec/mail.local/Makefile
+++ b/libexec/mail.local/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PACKAGE=sendmail
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
+SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/mail.local
 
 PROG=	mail.local
diff --git a/libexec/smrsh/Makefile b/libexec/smrsh/Makefile
index 02590ae61ed5..dc4f7c210695 100644
--- a/libexec/smrsh/Makefile
+++ b/libexec/smrsh/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PACKAGE=sendmail
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
+SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/smrsh
 
 PROG=	smrsh
diff --git a/libexec/talkd/Makefile b/libexec/talkd/Makefile
index cc0c5977fb7d..280d828d5248 100644
--- a/libexec/talkd/Makefile
+++ b/libexec/talkd/Makefile
@@ -3,8 +3,8 @@
 
 PROG=	ntalkd
 SRCS=	talkd.c announce.c process.c table.c print.c ttymsg.c
-.PATH:  ${.CURDIR}/../../usr.bin/wall
+.PATH:  ${SRCTOP}/usr.bin/wall
 MAN=	talkd.8
-CFLAGS+=-I${.CURDIR}/../../usr.bin/wall
+CFLAGS+=-I${SRCTOP}/usr.bin/wall
 
 .include <bsd.prog.mk>
diff --git a/libexec/tcpd/Makefile b/libexec/tcpd/Makefile
index 45add0bd95c8..7a4eb339c45b 100644
--- a/libexec/tcpd/Makefile
+++ b/libexec/tcpd/Makefile
@@ -2,7 +2,7 @@
 
 .include <src.opts.mk>
 
-.PATH: ${.CURDIR}/../../contrib/tcp_wrappers
+.PATH: ${SRCTOP}/contrib/tcp_wrappers
 
 PROG=	tcpd
 MAN=	tcpd.8
diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile
index 7cb9bc972ce2..6c953ddbd1d4 100644
--- a/libexec/telnetd/Makefile
+++ b/libexec/telnetd/Makefile
@@ -5,7 +5,7 @@
 
 .include <src.opts.mk>
 
-TELNETDIR=	${.CURDIR}/../../contrib/telnet
+TELNETDIR=	${SRCTOP}/contrib/telnet
 .PATH:		${TELNETDIR}/telnetd
 
 PROG=		telnetd
@@ -27,7 +27,7 @@ CFLAGS+=	-DINET6
 CFLAGS+=	-I${TELNETDIR}
 CFLAGS+=	-I${TELNETDIR}/telnet
 
-LIBTELNET=	${.OBJDIR}/../../lib/libtelnet/libtelnet.a
+LIBTELNET=	${OBJTOP}/lib/libtelnet/libtelnet.a
 
 LIBADD=		telnet util ncursesw
 
diff --git a/libexec/tftp-proxy/Makefile b/libexec/tftp-proxy/Makefile
index d8541c4b818e..596ca26cb61c 100644
--- a/libexec/tftp-proxy/Makefile
+++ b/libexec/tftp-proxy/Makefile
@@ -1,6 +1,6 @@
 #	$FreeBSD$
 
-.PATH:	${.CURDIR}/../../contrib/pf/tftp-proxy
+.PATH:	${SRCTOP}/contrib/pf/tftp-proxy
 
 PROG=	tftp-proxy
 SRCS=	tftp-proxy.c filter.c
diff --git a/libexec/ypxfr/Makefile b/libexec/ypxfr/Makefile
index d1a2f573a823..c4472fb167ce 100644
--- a/libexec/ypxfr/Makefile
+++ b/libexec/ypxfr/Makefile
@@ -7,7 +7,7 @@ SRCS=	yp_dblookup.c yp_dbwrite.c yp_error.c \
 	${GENSRCS}
 GENSRCS=yp.h yp_clnt.c ypxfr_clnt.c
 
-.PATH: ${.CURDIR}/../../usr.sbin/ypserv
+.PATH: ${SRCTOP}/usr.sbin/ypserv
 
 MAN=	ypxfr.8
 
@@ -20,7 +20,7 @@ LIBADD=	rpcsvc
 
 CLEANFILES= ${GENSRCS}
 
-RPCDIR= ${.CURDIR}/../../include/rpcsvc
+RPCDIR= ${SRCTOP}/include/rpcsvc
 RPCGEN=	RPCGEN_CPP=${CPP:Q} rpcgen -I -C
 
 ypxfr_clnt.c: ${RPCDIR}/yp.x