MFC r314653:

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

This simplifies make logic/output

10 files changed, 14 insertions, 15 deletions

diff --git a/libexec/atrun/Makefile b/libexec/atrun/Makefile
index 2730559..f2c11a5 100644
--- a/libexec/atrun/Makefile
+++ b/libexec/atrun/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-MAINSRC=${.CURDIR}/../../usr.bin/at
+MAINSRC=${SRCTOP}/usr.bin/at
 
 .include "${MAINSRC}/Makefile.inc"
 
diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile
index e415407f..88eb8a7 100644
--- a/libexec/ftpd/Makefile
+++ b/libexec/ftpd/Makefile
@@ -20,10 +20,9 @@ LDADD=	-lutil -lcrypt
 DPADD+=	${LIBOPIE} ${LIBMD}
 LDADD+=	-lopie -lmd
 
-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
 DPADD+=	${LIBM}
 LDADD+=	-lm
 
diff --git a/libexec/hyperv/Makefile b/libexec/hyperv/Makefile
index cea28f4..64cfb36 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 3e59609..40a1716 100644
--- a/libexec/mail.local/Makefile
+++ b/libexec/mail.local/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
 # $FreeBSD$
 
-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 ae86155..ff2bad7 100644
--- a/libexec/smrsh/Makefile
+++ b/libexec/smrsh/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/2/95
 # $FreeBSD$
 
-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 cc0c597..280d828 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 a2d1cbe..781fa72 100644
--- a/libexec/tcpd/Makefile
+++ b/libexec/tcpd/Makefile
@@ -2,7 +2,7 @@
 
 .include <bsd.own.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 75a33db..fac8ec4 100644
--- a/libexec/telnetd/Makefile
+++ b/libexec/telnetd/Makefile
@@ -5,7 +5,7 @@
 
 .include <bsd.own.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
 
 DPADD=		${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET}
 LDADD=		-lutil -ltermcap ${LIBTELNET}
diff --git a/libexec/tftp-proxy/Makefile b/libexec/tftp-proxy/Makefile
index d8541c4..596ca26 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 476a296..2468330 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
 
@@ -21,7 +21,7 @@ LDADD=	-lrpcsvc
 
 CLEANFILES= ${GENSRCS}
 
-RPCDIR= ${.CURDIR}/../../include/rpcsvc
+RPCDIR= ${SRCTOP}/include/rpcsvc
 RPCGEN=	RPCGEN_CPP=${CPP:Q} rpcgen -I -C
 
 ypxfr_clnt.c: ${RPCDIR}/yp.x