svn commit: r321267 - in stable/10/libexec: atrun ftpd hyperv mail.local smrsh talkd tcpd telnetd tftp-proxy ypxfr

Ngie Cooper ngie at FreeBSD.org
Thu Jul 20 00:52:14 UTC 2017


Author: ngie
Date: Thu Jul 20 00:52:11 2017
New Revision: 321267
URL: https://svnweb.freebsd.org/changeset/base/321267

Log:
  MFC r314653:
  
  libexec: normalize paths using SRCTOP-relative paths or :H when possible
  
  This simplifies make logic/output

Modified:
  stable/10/libexec/atrun/Makefile
  stable/10/libexec/ftpd/Makefile
  stable/10/libexec/hyperv/Makefile
  stable/10/libexec/mail.local/Makefile
  stable/10/libexec/smrsh/Makefile
  stable/10/libexec/talkd/Makefile
  stable/10/libexec/tcpd/Makefile
  stable/10/libexec/telnetd/Makefile
  stable/10/libexec/tftp-proxy/Makefile
  stable/10/libexec/ypxfr/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/libexec/atrun/Makefile
==============================================================================
--- stable/10/libexec/atrun/Makefile	Thu Jul 20 00:50:01 2017	(r321266)
+++ stable/10/libexec/atrun/Makefile	Thu Jul 20 00:52:11 2017	(r321267)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-MAINSRC=${.CURDIR}/../../usr.bin/at
+MAINSRC=${SRCTOP}/usr.bin/at
 
 .include "${MAINSRC}/Makefile.inc"
 

Modified: stable/10/libexec/ftpd/Makefile
==============================================================================
--- stable/10/libexec/ftpd/Makefile	Thu Jul 20 00:50:01 2017	(r321266)
+++ stable/10/libexec/ftpd/Makefile	Thu Jul 20 00:52:11 2017	(r321267)
@@ -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
 

Modified: stable/10/libexec/hyperv/Makefile
==============================================================================
--- stable/10/libexec/hyperv/Makefile	Thu Jul 20 00:50:01 2017	(r321266)
+++ stable/10/libexec/hyperv/Makefile	Thu Jul 20 00:52:11 2017	(r321267)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH:		${.CURDIR}/../../contrib/hyperv/tools/scripts
+.PATH:		${SRCTOP}/contrib/hyperv/tools/scripts
 
 BINDIR=		${LIBEXECDIR}/hyperv
 

Modified: stable/10/libexec/mail.local/Makefile
==============================================================================
--- stable/10/libexec/mail.local/Makefile	Thu Jul 20 00:50:01 2017	(r321266)
+++ stable/10/libexec/mail.local/Makefile	Thu Jul 20 00:52:11 2017	(r321267)
@@ -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

Modified: stable/10/libexec/smrsh/Makefile
==============================================================================
--- stable/10/libexec/smrsh/Makefile	Thu Jul 20 00:50:01 2017	(r321266)
+++ stable/10/libexec/smrsh/Makefile	Thu Jul 20 00:52:11 2017	(r321267)
@@ -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

Modified: stable/10/libexec/talkd/Makefile
==============================================================================
--- stable/10/libexec/talkd/Makefile	Thu Jul 20 00:50:01 2017	(r321266)
+++ stable/10/libexec/talkd/Makefile	Thu Jul 20 00:52:11 2017	(r321267)
@@ -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: stable/10/libexec/tcpd/Makefile
==============================================================================
--- stable/10/libexec/tcpd/Makefile	Thu Jul 20 00:50:01 2017	(r321266)
+++ stable/10/libexec/tcpd/Makefile	Thu Jul 20 00:52:11 2017	(r321267)
@@ -2,7 +2,7 @@
 
 .include <bsd.own.mk>
 
-.PATH: ${.CURDIR}/../../contrib/tcp_wrappers
+.PATH: ${SRCTOP}/contrib/tcp_wrappers
 
 PROG=	tcpd
 MAN=	tcpd.8

Modified: stable/10/libexec/telnetd/Makefile
==============================================================================
--- stable/10/libexec/telnetd/Makefile	Thu Jul 20 00:50:01 2017	(r321266)
+++ stable/10/libexec/telnetd/Makefile	Thu Jul 20 00:52:11 2017	(r321267)
@@ -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}

Modified: stable/10/libexec/tftp-proxy/Makefile
==============================================================================
--- stable/10/libexec/tftp-proxy/Makefile	Thu Jul 20 00:50:01 2017	(r321266)
+++ stable/10/libexec/tftp-proxy/Makefile	Thu Jul 20 00:52:11 2017	(r321267)
@@ -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: stable/10/libexec/ypxfr/Makefile
==============================================================================
--- stable/10/libexec/ypxfr/Makefile	Thu Jul 20 00:50:01 2017	(r321266)
+++ stable/10/libexec/ypxfr/Makefile	Thu Jul 20 00:52:11 2017	(r321267)
@@ -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


More information about the svn-src-all mailing list