Index: head/usr.sbin/amd/amd/Makefile
===================================================================
--- head/usr.sbin/amd/amd/Makefile	(revision 305786)
+++ head/usr.sbin/amd/amd/Makefile	(revision 305787)
@@ -1,52 +1,52 @@
 # ex:ts=8
 #
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
 # $FreeBSD$
 #
 
 .include <src.opts.mk>
 
-.PATH:	${.CURDIR}/../../../contrib/amd/amd
+.PATH:	${SRCTOP}/contrib/amd/amd
 
 PROG=	amd
 MAN=	amd.8
 SRCS=	conf_parse.y conf_tok.l
 SRCS+=	am_ops.c amd.c amfs_auto.c amfs_direct.c amfs_error.c amfs_generic.c
 SRCS+=	amfs_host.c amfs_link.c amfs_linkx.c amfs_nfsl.c
 SRCS+=	amfs_nfsx.c amfs_program.c amfs_root.c amfs_toplvl.c
 SRCS+=	amfs_union.c amq_subr.c amq_svc.c autil.c clock.c conf.c
 SRCS+=	get_args.c info_exec.c info_file.c info_ndbm.c info_passwd.c
 SRCS+=	info_union.c map.c mapc.c mntfs.c nfs_prot_svc.c nfs_start.c
 SRCS+=	nfs_subr.c ops_cdfs.c ops_mfs.c ops_nfs.c ops_nfs3.c
 SRCS+=	ops_nullfs.c ops_pcfs.c ops_tfs.c ops_ufs.c ops_umapfs.c
 SRCS+=	ops_unionfs.c opts.c readdir.c restart.c rpc_fwd.c sched.c
 SRCS+=	srvr_amfs_auto.c srvr_nfs.c
 
-CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amd \
+CFLAGS+= -I${SRCTOP}/contrib/amd/amd \
 	 -I${DESTDIR}/usr/include/rpcsvc
 
 LIBADD=	amu wrap
 
 CLEANFILES+=	conf_parse.c conf_parse.h conf_tok.c
 
 conf_tok.o: conf_parse.h
 
 #		These are generated at compile time
 SRCS+=		mount_xdr.c
 CLEANFILES+=	mount_xdr.c
 
 mount_xdr.c: ${MOUNT_X}
 	${RPCCOM} -c -DWANT_NFS3 ${MOUNT_X} -o ${.TARGET}
 
 .if ${MK_HESIOD} != "no"
 SRCS+=	info_hesiod.c
 CFLAGS+= -DHAVE_MAP_HESIOD
 .endif
 
 .if ${MK_NIS} != "no"
 SRCS+=	info_nis.c
 .endif
 
 .include <bsd.prog.mk>
Index: head/usr.sbin/amd/amq/Makefile
===================================================================
--- head/usr.sbin/amd/amq/Makefile	(revision 305786)
+++ head/usr.sbin/amd/amq/Makefile	(revision 305787)
@@ -1,19 +1,19 @@
 # ex:ts=8
 #
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
 # $FreeBSD$
 #
 
-.PATH: ${.CURDIR}/../../../contrib/amd/amq
+.PATH:	${SRCTOP}/contrib/amd/amq
 
 PROG=	amq
 MAN=	amq.8
 SRCS=	amq.c amq_clnt.c amq_xdr.c
 
-CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amq
+CFLAGS+= -I${SRCTOP}/contrib/amd/amq
 
 LIBADD=	amu
 
 .include <bsd.prog.mk>
Index: head/usr.sbin/amd/fixmount/Makefile
===================================================================
--- head/usr.sbin/amd/fixmount/Makefile	(revision 305786)
+++ head/usr.sbin/amd/fixmount/Makefile	(revision 305787)
@@ -1,20 +1,20 @@
 # ex:ts=8
 #
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../../contrib/amd/fixmount \
-       ${.CURDIR}/../../../contrib/amd/conf/checkmount
+.PATH:	${SRCTOP}/contrib/amd/fixmount \
+	${SRCTOP}/contrib/amd/conf/checkmount
 
 PROG=	fixmount
 MAN=	fixmount.8
 SRCS=	fixmount.c
 
 #	These would be links created by the GNU-style configure
 SRCS+=	checkmount_bsd44.c
 
 LIBADD+=	amu rpcsvc
 
 .include <bsd.prog.mk>
Index: head/usr.sbin/amd/fsinfo/Makefile
===================================================================
--- head/usr.sbin/amd/fsinfo/Makefile	(revision 305786)
+++ head/usr.sbin/amd/fsinfo/Makefile	(revision 305787)
@@ -1,24 +1,24 @@
 # ex:ts=8
 #
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../../contrib/amd/fsinfo
+.PATH:	${SRCTOP}/contrib/amd/fsinfo
 
 PROG=	fsinfo
 MAN=	fsinfo.8
 SRCS=	fsi_gram.y fsi_lex.l
 SRCS+=	fsi_analyze.c fsi_dict.c fsi_util.c fsinfo.c wr_atab.c 
 SRCS+=	wr_bparam.c wr_dumpset.c wr_exportfs.c wr_fstab.c
 
-CFLAGS+= -I${.CURDIR}/../../../contrib/amd/fsinfo
+CFLAGS+= -I${SRCTOP}/contrib/amd/fsinfo
 
 LIBADD=	amu
 
 CLEANFILES+=	fsi_gram.c fsi_gram.h fsi_lex.c
 
 fsi_lex.o: fsi_gram.h
 
 .include <bsd.prog.mk>
Index: head/usr.sbin/amd/hlfsd/Makefile
===================================================================
--- head/usr.sbin/amd/hlfsd/Makefile	(revision 305786)
+++ head/usr.sbin/amd/hlfsd/Makefile	(revision 305787)
@@ -1,18 +1,18 @@
 # ex:ts=8
 #
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../../contrib/amd/hlfsd
+.PATH:	${SRCTOP}/contrib/amd/hlfsd
 
 PROG=	hlfsd
 MAN=	hlfsd.8
 SRCS=	hlfsd.c homedir.c nfs_prot_svc.c stubs.c
 
-CFLAGS+= -I${.CURDIR}/../../../contrib/amd/hlfsd
+CFLAGS+= -I${SRCTOP}/contrib/amd/hlfsd
 
 LIBADD=	amu
 
 .include <bsd.prog.mk>
Index: head/usr.sbin/amd/include/Makefile
===================================================================
--- head/usr.sbin/amd/include/Makefile	(revision 305786)
+++ head/usr.sbin/amd/include/Makefile	(revision 305787)
@@ -1,29 +1,29 @@
 # ex:ts=8
 #
 # $FreeBSD$
 #
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998.
 #	Portions derived from amd/libamu/Makefile
 #	$NetBSD: Makefile,v 1.8 1998/08/08 22:33:37 christos Exp $
 
 .include <src.opts.mk>
 
 SRCS=	config_local.h
 .if ${MK_NIS} == "no"
 SRCS+=	localconfig.h
 .endif
 CLEANFILES=	${SRCS}
 
 all depend: ${SRCS}
 
-config_local.h: newvers.sh ${.CURDIR}/../../../sys/conf/newvers.sh
+config_local.h: newvers.sh ${SRCTOP}/sys/conf/newvers.sh
 	@rm -f ${.TARGET}
 	sh ${.ALLSRC} > ${.TARGET}
 
 localconfig.h:
 	@rm -f ${.TARGET}
 	@echo "/* NIS disabled by WITHOUT_NIS src.conf option */" >> ${.TARGET}
 	@echo "#undef HAVE_MAP_NIS" >> ${.TARGET}
 
 .include <bsd.prog.mk>
Index: head/usr.sbin/amd/libamu/Makefile
===================================================================
--- head/usr.sbin/amd/libamu/Makefile	(revision 305786)
+++ head/usr.sbin/amd/libamu/Makefile	(revision 305787)
@@ -1,36 +1,36 @@
 # ex:ts=8
 #
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../../contrib/amd/libamu \
-       ${.CURDIR}/../../../contrib/amd/conf/transp \
-       ${.CURDIR}/../../../contrib/amd/conf/mtab \
-       ${.CURDIR}/../../../contrib/amd/conf/umount
+.PATH:	${SRCTOP}/contrib/amd/libamu \
+	${SRCTOP}/contrib/amd/conf/transp \
+	${SRCTOP}/contrib/amd/conf/mtab \
+	${SRCTOP}/contrib/amd/conf/umount
 
 LIB=	amu
 INTERNALLIB=
 SRCS=	hasmntopt.c misc_rpc.c mount_fs.c mtab.c nfs_prot_xdr.c \
 	strutil.c wire.c xutil.c
 
 #	These would be links created by the GNU-style configure
 SRCS+=	transp_sockets.c mtab_bsd.c umount_bsd44.c
 
 #		Generated at compile time (replaces supplied xdr_func.c)
 SRCS+=		nfs_prot_x.c xdr_func_%undef.c
 CLEANFILES+=	nfs_prot_x.c xdr_func_%undef.c
 
-CFLAGS+= -I${.CURDIR}/../../../contrib/amd/libamu \
+CFLAGS+= -I${SRCTOP}/contrib/amd/libamu \
 	 -I${DESTDIR}/usr/include/rpcsvc
 
 nfs_prot_x.c: ${NFS_PROT_X}
 	${RPCCOM} -c -C -DWANT_NFS3 ${NFS_PROT_X} -o ${.TARGET}
 
-XDRDEFS!= grep 'ifndef.*HAVE_XDR' ${.CURDIR}/../../../contrib/amd/libamu/xdr_func.c | awk '{print "-D"$$2}'
+XDRDEFS!= grep 'ifndef.*HAVE_XDR' ${SRCTOP}/contrib/amd/libamu/xdr_func.c | awk '{print "-D"$$2}'
 
 xdr_func_%undef.c: xdr_func.c
 	-unifdef ${XDRDEFS} < ${.ALLSRC} > ${.TARGET}
 
 .include <bsd.lib.mk>
Index: head/usr.sbin/amd/mk-amd-map/Makefile
===================================================================
--- head/usr.sbin/amd/mk-amd-map/Makefile	(revision 305786)
+++ head/usr.sbin/amd/mk-amd-map/Makefile	(revision 305787)
@@ -1,15 +1,15 @@
 # ex:ts=8
 #
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../../contrib/amd/mk-amd-map
+.PATH:	${SRCTOP}/contrib/amd/mk-amd-map
 
 PROG=	mk-amd-map
 MAN=	mk-amd-map.8
 
 LIBADD=	amu
 
 .include <bsd.prog.mk>
Index: head/usr.sbin/amd/pawd/Makefile
===================================================================
--- head/usr.sbin/amd/pawd/Makefile	(revision 305786)
+++ head/usr.sbin/amd/pawd/Makefile	(revision 305787)
@@ -1,19 +1,19 @@
 # ex:ts=8
 #
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../../contrib/amd/amq
+.PATH:	${SRCTOP}/contrib/amd/amq
 
 BINDIR=	/usr/bin
 
 PROG=	pawd
 SRCS=	pawd.c amq_clnt.c amq_xdr.c
 
-CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amq
+CFLAGS+= -I${SRCTOP}/contrib/amd/amq
 
 LIBADD=	amu
 
 .include <bsd.prog.mk>
Index: head/usr.sbin/amd/scripts/Makefile
===================================================================
--- head/usr.sbin/amd/scripts/Makefile	(revision 305786)
+++ head/usr.sbin/amd/scripts/Makefile	(revision 305787)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../../contrib/amd/scripts
+.PATH: ${SRCTOP}/contrib/amd/scripts
 
 MAN=	amd.conf.5
 
 .include <bsd.prog.mk>
Index: head/usr.sbin/amd/wire-test/Makefile
===================================================================
--- head/usr.sbin/amd/wire-test/Makefile	(revision 305786)
+++ head/usr.sbin/amd/wire-test/Makefile	(revision 305787)
@@ -1,15 +1,15 @@
 # ex:ts=8
 #
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../../contrib/amd/wire-test
+.PATH:	${SRCTOP}/contrib/amd/wire-test
 
 PROG=	wire-test
 MAN=	wire-test.8
 
 LIBADD=	amu
 
 .include <bsd.prog.mk>