d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
This simplifies make logic/output

MFC after:	1 month
Sponsored by:	Dell EMC Isilon
This commit is contained in:
Enji Cooper 2017-03-04 11:28:03 +00:00
parent e44885ac01
commit a251f9dcf8
11 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libexec/atrun/Makefile
View File

@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=at
MAINSRC=${.CURDIR}/../../usr.bin/at
MAINSRC=${SRCTOP}/usr.bin/at
.include "${MAINSRC}/Makefile.inc"

4
libexec/dma/Makefile.inc
View File

@ -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} \

5
libexec/ftpd/Makefile
View File

@ -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"

2
libexec/hyperv/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$
.PATH: ${.CURDIR}/../../contrib/hyperv/tools/scripts
.PATH: ${SRCTOP}/contrib/hyperv/tools/scripts
BINDIR= ${LIBEXECDIR}/hyperv

2
libexec/mail.local/Makefile
View File

@ -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

2
libexec/smrsh/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PACKAGE=sendmail
SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
.PATH: ${SENDMAIL_DIR}/smrsh
PROG= smrsh

4
libexec/talkd/Makefile
View File

@ -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>

2
libexec/tcpd/Makefile
View File

@ -2,7 +2,7 @@
.include <src.opts.mk>
.PATH: ${.CURDIR}/../../contrib/tcp_wrappers
.PATH: ${SRCTOP}/contrib/tcp_wrappers
PROG= tcpd
MAN= tcpd.8

4
libexec/telnetd/Makefile
View File

@ -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

2
libexec/tftp-proxy/Makefile
View File

@ -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

4
libexec/ypxfr/Makefile
View File

@ -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