Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-1-6]: src/usr.sbin/rpc.pcnfsd Pull up revision 1.14 (requested by...



details:   https://anonhg.NetBSD.org/src/rev/4bf5ba5c8def
branches:  netbsd-1-6
changeset: 529595:4bf5ba5c8def
user:      he <he%NetBSD.org@localhost>
date:      Sat Nov 30 15:20:30 2002 +0000

description:
Pull up revision 1.14 (requested by thorpej in ticket #810):
  Resolve rpcgen's path in a way that works with other shells.

diffstat:

 usr.sbin/rpc.pcnfsd/Makefile |  17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diffs (37 lines):

diff -r b3117050633e -r 4bf5ba5c8def usr.sbin/rpc.pcnfsd/Makefile
--- a/usr.sbin/rpc.pcnfsd/Makefile      Sat Nov 30 15:17:08 2002 +0000
+++ b/usr.sbin/rpc.pcnfsd/Makefile      Sat Nov 30 15:20:30 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.12 2002/03/22 18:10:26 thorpej Exp $
+#      $NetBSD: Makefile,v 1.12.2.1 2002/11/30 15:20:30 he Exp $
 
 .include <bsd.own.mk>
 
@@ -17,20 +17,19 @@
 DPADD= ${LIBRPCSVC} ${LIBCRYPT}
 LDADD= -lrpcsvc -lcrypt
 
-.ifnmake getrpcgen
-XRPCGEN != cd ${.CURDIR} && ${MAKE} -B getrpcgen
+# Resolve rpcgen's path, to allow it to be a dependency.
+_RPCGEN:=      ${RPCGEN:M*rpcgen}
+.if ${_RPCGEN:M/*} == ""
+_RPCGEN!=      type ${RPCGEN} | awk '{print $$NF}'
 .endif
 
-getrpcgen:
-       @set -- X `type ${RPCGEN}` && shift `expr $$# - 1` && echo "$$1"
-
-pcnfsd_svc.c: pcnfsd.x ${XRPCGEN}
+pcnfsd_svc.c: pcnfsd.x ${_RPCGEN}
        ${RPCGEN} -C -s udp -s tcp -I ${.CURDIR}/pcnfsd.x -o $@
 
-pcnfsd_xdr.c: pcnfsd.x ${XRPCGEN}
+pcnfsd_xdr.c: pcnfsd.x ${_RPCGEN}
        ${RPCGEN} -C -c ${.CURDIR}/pcnfsd.x -o $@
 
-pcnfsd.h: pcnfsd.x ${XRPCGEN}
+pcnfsd.h: pcnfsd.x ${_RPCGEN}
        ${RPCGEN} -C -h ${.CURDIR}/pcnfsd.x -o $@
 
 CLEANFILES += pcnfsd_svc.c pcnfsd_xdr.c pcnfsd.h



Home | Main Index | Thread Index | Old Index