diff options
author | ngie <ngie@FreeBSD.org> | 2017-07-20 00:58:19 +0000 |
---|---|---|
committer | ngie <ngie@FreeBSD.org> | 2017-07-20 00:58:19 +0000 |
commit | 4332c2b3682711c4c9a5f87a21248319033b7ecb (patch) | |
tree | a5a703e478af2a17c939258d4da3e22ce7b51ea3 /libexec | |
parent | 97c764f8c94a61ea9c29267d332a2cacf2bd893c (diff) | |
download | FreeBSD-src-4332c2b3682711c4c9a5f87a21248319033b7ecb.zip FreeBSD-src-4332c2b3682711c4c9a5f87a21248319033b7ecb.tar.gz |
MFC r314653:
libexec: normalize paths using SRCTOP-relative paths or :H when possible
This simplifies make logic/output
Diffstat (limited to 'libexec')
-rw-r--r-- | libexec/atrun/Makefile | 2 | ||||
-rw-r--r-- | libexec/dma/Makefile.inc | 4 | ||||
-rw-r--r-- | libexec/ftpd/Makefile | 5 | ||||
-rw-r--r-- | libexec/hyperv/Makefile | 2 | ||||
-rw-r--r-- | libexec/mail.local/Makefile | 2 | ||||
-rw-r--r-- | libexec/smrsh/Makefile | 2 | ||||
-rw-r--r-- | libexec/talkd/Makefile | 4 | ||||
-rw-r--r-- | libexec/tcpd/Makefile | 2 | ||||
-rw-r--r-- | libexec/telnetd/Makefile | 4 | ||||
-rw-r--r-- | libexec/tftp-proxy/Makefile | 2 | ||||
-rw-r--r-- | libexec/ypxfr/Makefile | 4 |
11 files changed, 16 insertions, 17 deletions
diff --git a/libexec/atrun/Makefile b/libexec/atrun/Makefile index b11e2e9..18f8919 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 b24f85d..8e88f83 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 b945e55..7d6f5bd 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 a841477..a89b743 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 6b4256f..a642326 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 02590ae..dc4f7c2 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 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 45add0b..7a4eb33 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 7cb9bc9..6c953dd 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 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 d1a2f57..c4472fb 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 |