From 9c0b15185c9fe7e8d12f3de98763d865cf769295 Mon Sep 17 00:00:00 2001 From: ngie Date: Thu, 20 Jul 2017 00:52:11 +0000 Subject: [PATCH] MFC r314653: libexec: normalize paths using SRCTOP-relative paths or :H when possible This simplifies make logic/output git-svn-id: svn://svn.freebsd.org/base/stable/10@321267 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- libexec/atrun/Makefile | 2 +- libexec/ftpd/Makefile | 5 ++--- libexec/hyperv/Makefile | 2 +- libexec/mail.local/Makefile | 2 +- libexec/smrsh/Makefile | 2 +- libexec/talkd/Makefile | 4 ++-- libexec/tcpd/Makefile | 2 +- libexec/telnetd/Makefile | 4 ++-- libexec/tftp-proxy/Makefile | 2 +- libexec/ypxfr/Makefile | 4 ++-- 10 files changed, 14 insertions(+), 15 deletions(-) diff --git a/libexec/atrun/Makefile b/libexec/atrun/Makefile index 273055997..f2c11a5ff 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 e415407fb..88eb8a768 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 cea28f483..64cfb3654 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 3e59609e8..40a17169f 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 ae86155d0..ff2bad7f8 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 cc0c5977f..280d828d5 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 diff --git a/libexec/tcpd/Makefile b/libexec/tcpd/Makefile index a2d1cbe66..781fa72a9 100644 --- a/libexec/tcpd/Makefile +++ b/libexec/tcpd/Makefile @@ -2,7 +2,7 @@ .include -.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 75a33dbc8..fac8ec482 100644 --- a/libexec/telnetd/Makefile +++ b/libexec/telnetd/Makefile @@ -5,7 +5,7 @@ .include -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 d8541c4b8..596ca26cb 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 476a296fa..24683309e 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 -- 2.42.0