From 1a32a8fe6c10d31993da78aead00a5f1b703eb59 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Wed, 1 Mar 2017 04:16:40 +0000 Subject: [PATCH] Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones The SRCTOP conversion simplifies pathing in make/displayed output. Also, while here, change a hardcoded path to ${RPCDIR}/ypupdate_prot.x in the make targets with ${.ALLSRC} . MFC after: 1 week Sponsored by: Dell EMC Isilon --- usr.sbin/rpc.ypupdated/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/rpc.ypupdated/Makefile b/usr.sbin/rpc.ypupdated/Makefile index d5c346e2c3e..4cd6114a35b 100644 --- a/usr.sbin/rpc.ypupdated/Makefile +++ b/usr.sbin/rpc.ypupdated/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../ypserv ${.CURDIR}/../../libexec/ypxfr +.PATH: ${SRCTOP}/usr.sbin/ypserv ${SRCTOP}/libexec/ypxfr PROG= rpc.ypupdated MAN= @@ -9,7 +9,7 @@ SRCS= ypupdate_prot_svc.c ypupdate_prot.h ypupdated_main.c \ yp_dblookup.c yp_dbwrite.c yp_dbdelete.c yp_dbupdate.c #CFLAGS+= -DYP -CFLAGS+= -I${.CURDIR}/../ypserv -I. -I${.CURDIR}/../../libexec/ypxfr +CFLAGS+= -I${SRCTOP}/usr.sbin/ypserv -I. -I${SRCTOP}/libexec/ypxfr WARNS?= 1 @@ -24,10 +24,10 @@ RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -I -C # ypupdated_main.c can see it. ypupdate_prot_svc.c: ${RPCDIR}/ypupdate_prot.x rm -f ${.TARGET} - ${RPCGEN} -m ${RPCDIR}/ypupdate_prot.x | \ + ${RPCGEN} -m ${.ALLSRC} | \ sed s/"static int _rpcsvcstate"/"int _rpcsvcstate"/g > ${.TARGET} ypupdate_prot.h: ${RPCDIR}/ypupdate_prot.x - ${RPCGEN} -h -o ${.TARGET} ${RPCDIR}/ypupdate_prot.x + ${RPCGEN} -h -o ${.TARGET} ${.ALLSRC} .include