Author: ngie
Date: Sat Mar 4 11:28:03 2017
New Revision: 314653
URL: https://svnweb.freebsd.org/changeset/base/314653
Log:
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
Modified:
head/libexec/atrun/Makefile
head/libexec/dma/Makefile.inc
head/libexec/ftpd/Makefile
head/libexec/hyperv/Makefile
head/libexec/mail.local/Makefile
head/libexec/smrsh/Makefile
head/libexec/talkd/Makefile
head/libexec/tcpd/Makefile
head/libexec/telnetd/Makefile
head/libexec/tftp-proxy/Makefile
head/libexec/ypxfr/Makefile
Modified: head/libexec/atrun/Makefile
==============================================================================
--- head/libexec/atrun/Makefile Sat Mar 4 11:26:40 2017 (r314652)
+++ head/libexec/atrun/Makefile Sat Mar 4 11:28:03 2017 (r314653)
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=at
-MAINSRC=${.CURDIR}/../../usr.bin/at
+MAINSRC=${SRCTOP}/usr.bin/at
.include "${MAINSRC}/Makefile.inc"
Modified: head/libexec/dma/Makefile.inc
==============================================================================
--- head/libexec/dma/Makefile.inc Sat Mar 4 11:26:40 2017
(r314652)
+++ head/libexec/dma/Makefile.inc Sat Mar 4 11:28:03 2017
(r314653)
@@ -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} \
Modified: head/libexec/ftpd/Makefile
==============================================================================
--- head/libexec/ftpd/Makefile Sat Mar 4 11:26:40 2017 (r314652)
+++ head/libexec/ftpd/Makefile Sat Mar 4 11:28:03 2017 (r314653)
@@ -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"
Modified: head/libexec/hyperv/Makefile
==============================================================================
--- head/libexec/hyperv/Makefile Sat Mar 4 11:26:40 2017
(r314652)
+++ head/libexec/hyperv/Makefile Sat Mar 4 11:28:03 2017
(r314653)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../contrib/hyperv/tools/scripts
+.PATH: ${SRCTOP}/contrib/hyperv/tools/scripts
BINDIR= ${LIBEXECDIR}/hyperv
Modified: head/libexec/mail.local/Makefile
==============================================================================
--- head/libexec/mail.local/Makefile Sat Mar 4 11:26:40 2017
(r314652)
+++ head/libexec/mail.local/Makefile Sat Mar 4 11:28:03 2017
(r314653)
@@ -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
Modified: head/libexec/smrsh/Makefile
==============================================================================
--- head/libexec/smrsh/Makefile Sat Mar 4 11:26:40 2017 (r314652)
+++ head/libexec/smrsh/Makefile Sat Mar 4 11:28:03 2017 (r314653)
@@ -2,7 +2,7 @@
# $FreeBSD$
PACKAGE=sendmail
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
+SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
.PATH: ${SENDMAIL_DIR}/smrsh
PROG= smrsh
Modified: head/libexec/talkd/Makefile
==============================================================================
--- head/libexec/talkd/Makefile Sat Mar 4 11:26:40 2017 (r314652)
+++ head/libexec/talkd/Makefile Sat Mar 4 11:28:03 2017 (r314653)
@@ -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>
Modified: head/libexec/tcpd/Makefile
==============================================================================
--- head/libexec/tcpd/Makefile Sat Mar 4 11:26:40 2017 (r314652)
+++ head/libexec/tcpd/Makefile Sat Mar 4 11:28:03 2017 (r314653)
@@ -2,7 +2,7 @@
.include <src.opts.mk>
-.PATH: ${.CURDIR}/../../contrib/tcp_wrappers
+.PATH: ${SRCTOP}/contrib/tcp_wrappers
PROG= tcpd
MAN= tcpd.8
Modified: head/libexec/telnetd/Makefile
==============================================================================
--- head/libexec/telnetd/Makefile Sat Mar 4 11:26:40 2017
(r314652)
+++ head/libexec/telnetd/Makefile Sat Mar 4 11:28:03 2017
(r314653)
@@ -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
Modified: head/libexec/tftp-proxy/Makefile
==============================================================================
--- head/libexec/tftp-proxy/Makefile Sat Mar 4 11:26:40 2017
(r314652)
+++ head/libexec/tftp-proxy/Makefile Sat Mar 4 11:28:03 2017
(r314653)
@@ -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
Modified: head/libexec/ypxfr/Makefile
==============================================================================
--- head/libexec/ypxfr/Makefile Sat Mar 4 11:26:40 2017 (r314652)
+++ head/libexec/ypxfr/Makefile Sat Mar 4 11:28:03 2017 (r314653)
@@ -7,7 +7,7 @@ SRCS= yp_dblookup.c yp_dbwrite.c yp_erro
${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
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
