yppush_main.c:

- Remove unused 'pid' member from the jobs structure. (This was left over
  from an earlier incarnation of the program that used multiple processes.)

- Remove #ifdef'ed longjmp() stuff.

- Print warning message if the 'pushing' host is not the master for
  a map being pushed but don't bail out. (While yppush should only
  be used on an NIS master, using it elsewhere is not an unpardonable sin.)

yppush.8:

- Fix a couple of mind-os.

Makefile

- Change format to hopefully ease bootstrapping. (Suggested by wollman.)
  Other Makefiles should follow.

1 files changed, 13 insertions, 11 deletions

diff --git a/usr.sbin/yppush/Makefile b/usr.sbin/yppush/Makefile
index e8aaea6..67a8116 100644
--- a/usr.sbin/yppush/Makefile
+++ b/usr.sbin/yppush/Makefile
@@ -4,23 +4,25 @@ PROG=	yppush
 SRCS=	yp_clnt.c ypxfr_getmap.c yp_dblookup.c yppush_svc.c \
 	yp_error.c ypxfr_misc.c yppush_main.c
 
-.PATH: ${.CURDIR}/../ypserv ${.CURDIR}/../../libexec/ypxfr
-
 MAN8=	yppush.8
-CFLAGS+=-I. -I${.CURDIR}/../../libexec/ypxfr
 
-CLEANFILES= yp.h yp_clnt.c yppush_svc.c
+CFLAGS+=-I. -I${.CURDIR}/../../libexec/ypxfr
 
-RPCSRC= ${.DESTDIR}/usr/include/rpcsvc/yp.x
+RPCDIR=	${.CURDIR}/../../include/rpcsvc
 RPCGEN= rpcgen -C
 
-yppush_svc.c: ${RPCSRC} yp.h
-	${RPCGEN} -DYPPUSH_ONLY -m -o ${.TARGET} ${RPCSRC}
+.PATH:	${RPCDIR} ${.CURDIR}/../../usr.sbin/ypserv \
+	${.CURDIR}/../../libexec/ypxfr
+
+CLEANFILES= yp.h yp_clnt.c yppush_svc.c
+
+yppush_svc.c: yp.x yp.h
+	${RPCGEN} -DYPPUSH_ONLY -m -o ${.TARGET} ${RPCDIR}/yp.x
 
-yp_clnt.c: ${RPCSRC} yp.h
-	${RPCGEN} -DYPSERV_ONLY -l -o ${.TARGET} ${RPCSRC}
+yp_clnt.c: yp.x yp.h
+	${RPCGEN} -DYPSERV_ONLY -l -o ${.TARGET} ${RPCDIR}/yp.x
 
-yp.h: ${RPCSRC}
-	${RPCGEN} -h -o ${.TARGET} ${RPCSRC}
+yp.h: yp.x
+	${RPCGEN} -h -o ${.TARGET} ${RPCDIR}/yp.x
 
 .include <bsd.prog.mk>