diff --git a/regress/lib/libc/ieeefp/testfloat/Makefile b/regress/lib/libc/ieeefp/testfloat/Makefile
index 1adffe69de20..a5ececca2912 100644
--- a/regress/lib/libc/ieeefp/testfloat/Makefile
+++ b/regress/lib/libc/ieeefp/testfloat/Makefile
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.4 2002/05/21 23:58:42 bjh21 Exp $
-
-TOSRC=		${.CURDIR}/../../../../..
-SOFTFLOAT_BITS=	64
-SFLIB1=		${TOSRC}/lib/libc/softfloat
-SFLIB2=		${TOSRC}/lib/libc/softfloat/bits${SOFTFLOAT_BITS}
-.PATH:		${SFLIB1} ${SFLIB2} ${.CURDIR}/arch/${MACHINE_ARCH}
+# $NetBSD: Makefile,v 1.5 2002/09/18 04:16:00 lukem Exp $
 
 NOMAN=		# defined
+
+.include <bsd.own.mk>
+
+SOFTFLOAT_BITS=	64
+SFLIB1=		${NETBSDSRCDIR}/lib/libc/softfloat
+SFLIB2=		${NETBSDSRCDIR}/lib/libc/softfloat/bits${SOFTFLOAT_BITS}
+.PATH:		${SFLIB1} ${SFLIB2} ${.CURDIR}/arch/${MACHINE_ARCH}
+
 WARNS=		2
 CPPFLAGS+=	-I${.CURDIR}/include -I${SFLIB1} -I${SFLIB2}
 LDADD+=		-lm
diff --git a/regress/lib/libc/regex/Makefile b/regress/lib/libc/regex/Makefile
index 204e8c2c9fca..7da7590c4331 100644
--- a/regress/lib/libc/regex/Makefile
+++ b/regress/lib/libc/regex/Makefile
@@ -1,9 +1,12 @@
-#	$NetBSD: Makefile,v 1.5 2001/12/12 01:24:03 tv Exp $
+#	$NetBSD: Makefile,v 1.6 2002/09/18 04:16:01 lukem Exp $
+
+NOMAN=		# defined
+
+.include <bsd.own.mk>
 
 PROG=		re
 SRCS=		main.c split.c debug.c
-NOMAN=		# defined
-CPPFLAGS+=	-I${.CURDIR}/../../../../lib/libc/regex
+CPPFLAGS+=	-I${NETBSDSRCDIR}/lib/libc/regex
 
 TESTS=		${.CURDIR}/tests
 
diff --git a/regress/lib/libcrypto/Makefile.inc b/regress/lib/libcrypto/Makefile.inc
index 72e3a28b126a..616ead2fdb82 100644
--- a/regress/lib/libcrypto/Makefile.inc
+++ b/regress/lib/libcrypto/Makefile.inc
@@ -1,6 +1,8 @@
-#	$NetBSD: Makefile.inc,v 1.2 2002/08/18 14:59:34 itojun Exp $
+#	$NetBSD: Makefile.inc,v 1.3 2002/09/18 04:16:01 lukem Exp $
 
-CRYPTODIST=${.CURDIR}/../../../../crypto/dist/openssl/crypto
+.include <bsd.own.mk>
+
+CRYPTODIST=${NETBSDSRCDIR}/crypto/dist/openssl/crypto
 
 # do not install regression test programs
 proginstall::
diff --git a/regress/lib/libcrypto/bn/Makefile.inc b/regress/lib/libcrypto/bn/Makefile.inc
index 002132a6bcd4..37847ad6af71 100644
--- a/regress/lib/libcrypto/bn/Makefile.inc
+++ b/regress/lib/libcrypto/bn/Makefile.inc
@@ -1,6 +1,8 @@
-#	$NetBSD: Makefile.inc,v 1.3 2002/08/31 10:46:43 itojun Exp $
+#	$NetBSD: Makefile.inc,v 1.4 2002/09/18 04:16:01 lukem Exp $
 
-CRYPTODIST=${.CURDIR}/../../../../../crypto/dist/openssl/crypto
+.include <bsd.own.mk>
+
+CRYPTODIST=${NETBSDSRCDIR}/crypto/dist/openssl/crypto
 .PATH:	${CRYPTODIST}/bn
 
 CPPFLAGS+=	-I${CRYPTODIST}/..
diff --git a/regress/sys/arch/m68k/060sp/Makefile b/regress/sys/arch/m68k/060sp/Makefile
index 85b0e7531c4e..83460218e621 100644
--- a/regress/sys/arch/m68k/060sp/Makefile
+++ b/regress/sys/arch/m68k/060sp/Makefile
@@ -1,11 +1,14 @@
-#	$NetBSD: Makefile,v 1.9 2001/12/12 01:24:13 tv Exp $
+#	$NetBSD: Makefile,v 1.10 2002/09/18 04:16:01 lukem Exp $
+
+NOMAN=		# defined
+
+.include <bsd.own.mk>
 
 PROG=		dotest
 SRCS=		dotest.c dotestsubs.S
-NOMAN=		# defined
 AFLAGS+=	-I.
 CPPFLAGS+=	-I.
-SPDIR=		${.CURDIR}/../../../../../sys/arch/m68k/060sp
+SPDIR=		${NETBSDSRCDIR}/sys/arch/m68k/060sp
 CLEANFILES+=	itest.S ftest.S
 
 .SUFFIXES: .S .sa
diff --git a/regress/sys/crypto/Makefile.inc b/regress/sys/crypto/Makefile.inc
index 37c03fd0c98d..dcd3a775745e 100644
--- a/regress/sys/crypto/Makefile.inc
+++ b/regress/sys/crypto/Makefile.inc
@@ -1,8 +1,10 @@
-#	$NetBSD: Makefile.inc,v 1.6 2002/08/18 14:59:34 itojun Exp $
+#	$NetBSD: Makefile.inc,v 1.7 2002/09/18 04:16:01 lukem Exp $
 #	$KAME: Makefile.inc,v 1.3 2000/11/08 05:58:24 itojun Exp $
 
 .if !target(regress)
-SYSDIR=	${.CURDIR}/../../../../sys
+.include <bsd.own.mk>
+
+SYSDIR=	${NETBSDSRCDIR}/sys
 WARNS?=	1
 
 regress:
diff --git a/regress/sys/kern/extent/Makefile b/regress/sys/kern/extent/Makefile
index 72d39a233e12..60ccfc642bbc 100644
--- a/regress/sys/kern/extent/Makefile
+++ b/regress/sys/kern/extent/Makefile
@@ -1,13 +1,16 @@
-# $NetBSD: Makefile,v 1.4 2001/12/12 01:24:16 tv Exp $
+# $NetBSD: Makefile,v 1.5 2002/09/18 04:16:02 lukem Exp $
+
+NOMAN=		# defined
+
+.include <bsd.own.mk>
 
 PROG=		extest
-NOMAN=		# defined
 SRCS=		extest.c subr_extent.c
 CPPFLAGS+=	-D_EXTENT_TESTING -D__POOL_EXPOSE
 CLEANFILES+=	extest.c extest.out
 WARNS?=		1
 
-.PATH:		${.CURDIR}/../../../../sys/kern
+.PATH:		${NETBSDSRCDIR}/sys/kern
 
 regress: ${PROG}
 	./${PROG} >extest.out
diff --git a/regress/usr.bin/bzip2/Makefile b/regress/usr.bin/bzip2/Makefile
index 01e810e6f2bb..294cc3508b92 100644
--- a/regress/usr.bin/bzip2/Makefile
+++ b/regress/usr.bin/bzip2/Makefile
@@ -1,7 +1,10 @@
-#	$NetBSD: Makefile,v 1.2 2001/12/12 01:24:19 tv Exp $
+#	$NetBSD: Makefile,v 1.3 2002/09/18 04:16:02 lukem Exp $
 
 NOMAN=  	# defined
-DIST=		${.CURDIR}/../../../dist/bzip2
+
+.include <bsd.own.mk>
+
+DIST=		${NETBSDSRCDIR}/dist/bzip2
 
 regress:
 	bzip2 -1  < ${DIST}/sample1.ref > sample1.rb2
diff --git a/usr.sbin/amd/Makefile.inc b/usr.sbin/amd/Makefile.inc
index 08df7492ffb6..6ea1e22fedd4 100644
--- a/usr.sbin/amd/Makefile.inc
+++ b/usr.sbin/amd/Makefile.inc
@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile.inc,v 1.17 2002/03/22 18:10:25 thorpej Exp $
+#	$NetBSD: Makefile.inc,v 1.18 2002/09/18 03:54:26 lukem Exp $
 
 WARNS?=	1
 WFORMAT=2
 
 .include <bsd.own.mk>
 
-IDIST=	${.CURDIR}/../../../dist/am-utils
+IDIST=	${NETBSDSRCDIR}/dist/am-utils
 
 LIBAMUOBJDIR!=cd ${.CURDIR}/../libamu && ${PRINTOBJDIR}
 
diff --git a/usr.sbin/amd/libamu/Makefile b/usr.sbin/amd/libamu/Makefile
index 030f65f6454d..c16adf7245ca 100644
--- a/usr.sbin/amd/libamu/Makefile
+++ b/usr.sbin/amd/libamu/Makefile
@@ -1,9 +1,11 @@
-#	$NetBSD: Makefile,v 1.15 2001/12/12 01:48:48 tv Exp $
-
-LIB=	amu
+#	$NetBSD: Makefile,v 1.16 2002/09/18 03:54:27 lukem Exp $
 
 NOLINKLIB=	# defined
 
+.include <bsd.own.mk>
+
+LIB=	amu
+
 .include "${.CURDIR}/../Makefile.inc"
 
 DIST=	${IDIST}/libamu
@@ -16,7 +18,7 @@ SRCS=	hasmntopt.c misc_rpc.c mount_fs.c mtab.c mtab_bsd.c \
 # some host specific compile time settings amd wants to have compiled in
 config_local.h: mkconf
 	@rm -f ${.TARGET}
-	sh ${.ALLSRC} `sh ${.CURDIR}/../../../sys/conf/osrelease.sh` > ${.TARGET}
+	sh ${.ALLSRC} `sh ${NETBSDSRCDIR}/sys/conf/osrelease.sh` > ${.TARGET}
 
 CLEANFILES+=	config_local.h
 
diff --git a/usr.sbin/bind/Makefile.inc b/usr.sbin/bind/Makefile.inc
index 7bf763e5eebf..2aa336cbd5ab 100644
--- a/usr.sbin/bind/Makefile.inc
+++ b/usr.sbin/bind/Makefile.inc
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.inc,v 1.12 2001/05/27 04:40:38 itojun Exp $
+# $NetBSD: Makefile.inc,v 1.13 2002/09/18 03:54:27 lukem Exp $
 
 .include <bsd.own.mk>
 
 WARNS=0
 WFORMAT=2
 BIND_DIR=	${.CURDIR}/..
-BIND_DIST_DIR=	${.CURDIR}/../../../dist/bind
-BIND_CRYPTO_DIST_DIR=	${.CURDIR}/../../../crypto/dist/bind
+BIND_DIST_DIR=	${NETBSDSRCDIR}/dist/bind
+BIND_CRYPTO_DIST_DIR=	${NETBSDSRCDIR}/crypto/dist/bind
 
 VER0!=		cat ${BIND_DIST_DIR}/Version
 .if 0 # ${MKCRYPTO} == "yes"
diff --git a/usr.sbin/bind/doc/bog/Makefile b/usr.sbin/bind/doc/bog/Makefile
index becf8c6d05bb..4126b6156fbe 100644
--- a/usr.sbin/bind/doc/bog/Makefile
+++ b/usr.sbin/bind/doc/bog/Makefile
@@ -1,6 +1,8 @@
-#	$NetBSD: Makefile,v 1.2 2001/12/09 23:40:24 jmc Exp $
+#	$NetBSD: Makefile,v 1.3 2002/09/18 03:54:27 lukem Exp $
 
-DIST=	${.CURDIR}/../../../../dist
+.include <bsd.own.mk>
+
+DIST=	${NETBSDSRCDIR}/dist
 .PATH: ${DIST}/bind/doc/bog
 
 DIR=	smm/10.named
diff --git a/usr.sbin/catman/Makefile b/usr.sbin/catman/Makefile
index b7efa75fb542..a1f2f40ac619 100644
--- a/usr.sbin/catman/Makefile
+++ b/usr.sbin/catman/Makefile
@@ -1,10 +1,12 @@
-#	$NetBSD: Makefile,v 1.7 2002/09/13 20:40:04 mycroft Exp $
+#	$NetBSD: Makefile,v 1.8 2002/09/18 03:54:28 lukem Exp $
+
+.include <bsd.own.mk>
 
 BINDIR=		/usr/sbin
 PROG=		catman
 SRCS=		catman.c manconf.c
 MAN=		catman.8
-.PATH:		${.CURDIR}/../../usr.bin/man
-CPPFLAGS+=-I${.CURDIR}/../../usr.bin/man
+.PATH:		${NETBSDSRCDIR}/usr.bin/man
+CPPFLAGS+=	-I${NETBSDSRCDIR}/usr.bin/man
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/chrtbl/Makefile b/usr.sbin/chrtbl/Makefile
index c4c33267903a..fb7f0bc67234 100644
--- a/usr.sbin/chrtbl/Makefile
+++ b/usr.sbin/chrtbl/Makefile
@@ -1,11 +1,13 @@
-#	$NetBSD: Makefile,v 1.3 2001/03/17 20:43:55 christos Exp $
+#	$NetBSD: Makefile,v 1.4 2002/09/18 03:54:28 lukem Exp $
+
+.include <bsd.own.mk>
 
 PROG=	chrtbl
 MAN=	chrtbl.8
 
-.PATH:	${.CURDIR}/../../lib/libc/locale
+.PATH:	${NETBSDSRCDIR}/lib/libc/locale
 
-CPPFLAGS+=-I${.CURDIR}/../../lib/libc/locale
+CPPFLAGS+=-I${NETBSDSRCDIR}/lib/libc/locale
 
 # ctypeio.c pulled in from ../../lib/libc/locale
 SRCS=	chrtbl.c ctypeio.c
diff --git a/usr.sbin/dhcp/Makefile.inc b/usr.sbin/dhcp/Makefile.inc
index 4b11ef0d1af8..a695797bd350 100644
--- a/usr.sbin/dhcp/Makefile.inc
+++ b/usr.sbin/dhcp/Makefile.inc
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.inc,v 1.17 2002/06/16 21:40:03 augustss Exp $
+# $NetBSD: Makefile.inc,v 1.18 2002/09/18 03:54:28 lukem Exp $
 
 WARNS?=	1
 
 .include <bsd.own.mk>
 
-DIST=	${.CURDIR}/../../../dist/dhcp
+DIST=	${NETBSDSRCDIR}/dist/dhcp
 .PATH:	${DIST}/${DHCPSRCDIR}
 
 COBJDIR!=cd $(.CURDIR)/../common && ${PRINTOBJDIR}
diff --git a/usr.sbin/dumpfs/Makefile b/usr.sbin/dumpfs/Makefile
index cf08fc8e5b4b..ba2b850314f3 100644
--- a/usr.sbin/dumpfs/Makefile
+++ b/usr.sbin/dumpfs/Makefile
@@ -1,6 +1,8 @@
-#	$NetBSD: Makefile,v 1.11 2001/11/09 12:01:13 lukem Exp $
+#	$NetBSD: Makefile,v 1.12 2002/09/18 03:54:28 lukem Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
+.include <bsd.own.mk>
+
 PROG=	dumpfs
 MAN=	dumpfs.8
 SRCS=	dumpfs.c ffs_bswap.c
@@ -8,7 +10,7 @@ LDADD+=	-lutil
 
 WARNS=	2
 
-.PATH:  ${.CURDIR}/../../sys/ufs/ffs
+.PATH:  ${NETBSDSRCDIR}/sys/ufs/ffs
 
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/dumplfs/Makefile b/usr.sbin/dumplfs/Makefile
index e08df6bbb3c4..740464b032db 100644
--- a/usr.sbin/dumplfs/Makefile
+++ b/usr.sbin/dumplfs/Makefile
@@ -1,9 +1,11 @@
-#	$NetBSD: Makefile,v 1.9 1998/03/01 02:26:12 fvdl Exp $
+#	$NetBSD: Makefile,v 1.10 2002/09/18 03:54:29 lukem Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
 
+.include <bsd.own.mk>
+
 PROG=	dumplfs
 SRCS=	dumplfs.c lfs_cksum.c misc.c
-.PATH:	${.CURDIR}/../../sys/ufs/lfs
+.PATH:	${NETBSDSRCDIR}/sys/ufs/lfs
 MAN=	dumplfs.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/grfconfig/Makefile b/usr.sbin/grfconfig/Makefile
index 743d790ed530..f73f223108da 100644
--- a/usr.sbin/grfconfig/Makefile
+++ b/usr.sbin/grfconfig/Makefile
@@ -1,8 +1,10 @@
-#   $NetBSD: Makefile,v 1.6 2002/07/09 22:18:37 jdolecek Exp $
+#   $NetBSD: Makefile,v 1.7 2002/09/18 03:54:29 lukem Exp $
+
+.include <bsd.own.mk>
 
 .if ${MACHINE} == "amiga"
 PROG=		grfconfig
-CPPFLAGS+=	-I${.CURDIR}/../../sys/arch -D${MACHINE}
+CPPFLAGS+=	-I${NETBSDSRCDIR}/sys/arch -D${MACHINE}
 .endif
 
 MAN=		grfconfig.8
diff --git a/usr.sbin/grfinfo/Makefile b/usr.sbin/grfinfo/Makefile
index d1274ced4a13..c34ec3ccc704 100644
--- a/usr.sbin/grfinfo/Makefile
+++ b/usr.sbin/grfinfo/Makefile
@@ -1,8 +1,10 @@
-#	$NetBSD: Makefile,v 1.5 1997/10/25 06:58:02 lukem Exp $
+#	$NetBSD: Makefile,v 1.6 2002/09/18 03:54:29 lukem Exp $
+
+.include <bsd.own.mk>
 
 .if ${MACHINE} == "hp300"
 PROG=	grfinfo
-CPPFLAGS+= -I${.CURDIR}/../../sys/arch/hp300
+CPPFLAGS+= -I${NETBSDSRCDIR}/sys/arch/hp300
 .endif
 
 MAN=	grfinfo.1
diff --git a/usr.sbin/hilinfo/Makefile b/usr.sbin/hilinfo/Makefile
index 20f816bf9ac9..9b7bcf375b26 100644
--- a/usr.sbin/hilinfo/Makefile
+++ b/usr.sbin/hilinfo/Makefile
@@ -1,11 +1,12 @@
-#	$NetBSD: Makefile,v 1.6 2001/12/12 01:48:51 tv Exp $
+#	$NetBSD: Makefile,v 1.7 2002/09/18 03:54:29 lukem Exp $
+
+NOMAN=	# defined
+
+.include <bsd.own.mk>
 
 .if ${MACHINE} == "hp300"
 PROG=	hilinfo
-CPPFLAGS+= -I${.CURDIR}/../../sys/arch/hp300
-.else
-NOOBJ=	# defined
+CPPFLAGS+= -I${NETBSDSRCDIR}/sys/arch/hp300
 .endif
-NOMAN=	# defined
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/hprop/Makefile b/usr.sbin/hprop/Makefile
index 711da07808c5..0697a31bd0a9 100644
--- a/usr.sbin/hprop/Makefile
+++ b/usr.sbin/hprop/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2001/12/12 12:24:30 lukem Exp $
+# $NetBSD: Makefile,v 1.7 2002/09/18 03:54:30 lukem Exp $
 
 NOLINT= # defined
 
 .include <bsd.own.mk>
 
-DIST=		${.CURDIR}/../../crypto/dist
+DIST=		${NETBSDSRCDIR}/crypto/dist
 .PATH: ${DIST}/heimdal/kdc
 
 WARNS?=  1
@@ -19,13 +19,13 @@ CPPFLAGS+= -I.					\
 	-I${DIST}/heimdal/kdc			\
 	-I${DIST}/heimdal/lib/hdb		\
 	-I${DIST}/heimdal/lib/krb5		\
-	-I${.CURDIR}/../../include/heimdal	\
+	-I${NETBSDSRCDIR}/include/heimdal	\
 	-I${DIST}/heimdal/lib/asn1		\
 	-I${DESTDIR}/usr/include/kerberosIV	\
 	-I${DESTDIR}/usr/include/krb5		\
 	-DHAVE_CONFIG_H
 
-VERS!=	cd ${.CURDIR}/../../lib/libvers && ${PRINTOBJDIR}
+VERS!=	cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}
 
 LDADD=	-lhdb					\
 	-lkrb5					\
diff --git a/usr.sbin/iostat/Makefile b/usr.sbin/iostat/Makefile
index 46b5c2757bda..6bf37d65b84a 100644
--- a/usr.sbin/iostat/Makefile
+++ b/usr.sbin/iostat/Makefile
@@ -1,12 +1,14 @@
-#	$NetBSD: Makefile,v 1.19 2002/03/28 09:58:10 jmc Exp $
+#	$NetBSD: Makefile,v 1.20 2002/09/18 03:54:30 lukem Exp $
 #	from: @(#)Makefile	8.1 (Berkeley) 6/6/93
 
+.include <bsd.own.mk>
+
 PROG=	iostat
 MAN=	iostat.8
 
-.PATH:	${.CURDIR}/../../usr.bin/vmstat
+.PATH:	${NETBSDSRCDIR}/usr.bin/vmstat
 
-CPPFLAGS+=-I${.CURDIR}/../../usr.bin/vmstat
+CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/vmstat
 
 # dkstats.c pulled in from ../../usr.bin/vmstat
 SRCS=	dkstats.c iostat.c
diff --git a/usr.sbin/ipf/Makefile.inc b/usr.sbin/ipf/Makefile.inc
index 766b27cb24f9..899d45181bb8 100644
--- a/usr.sbin/ipf/Makefile.inc
+++ b/usr.sbin/ipf/Makefile.inc
@@ -1,10 +1,12 @@
-#	$NetBSD: Makefile.inc,v 1.8 2001/03/13 16:29:42 christos Exp $
+#	$NetBSD: Makefile.inc,v 1.9 2002/09/18 03:54:30 lukem Exp $
 
-CPPFLAGS+=-I${.CURDIR}/../../../sys -I${.CURDIR}/../../../sys/netinet
+.include <bsd.own.mk>
+
+CPPFLAGS+=-I${NETBSDSRCDIR}/sys -I${NETBSDSRCDIR}/sys/netinet
 CPPFLAGS+=-DUSE_INET6 -DSTATETOP
 
-.PATH:	${.CURDIR}/../../../dist/ipf \
-	${.CURDIR}/../../../dist/ipf/man
+.PATH:	${NETBSDSRCDIR}/dist/ipf \
+	${NETBSDSRCDIR}/dist/ipf/man
 
 .if exists(${.CURDIR}/../../Makefile.inc)
 .include "${.CURDIR}/../../Makefile.inc"
diff --git a/usr.sbin/ipf/ipftest/Makefile b/usr.sbin/ipf/ipftest/Makefile
index c92536e9c2bd..d7192a394e42 100644
--- a/usr.sbin/ipf/ipftest/Makefile
+++ b/usr.sbin/ipf/ipftest/Makefile
@@ -1,4 +1,6 @@
-#	$NetBSD: Makefile,v 1.20 2002/05/13 06:35:47 martti Exp $
+#	$NetBSD: Makefile,v 1.21 2002/09/18 03:54:30 lukem Exp $
+
+.include <bsd.own.mk>
 
 PROG=	ipftest
 SRCS=	ipt.c parse.c common.c fil.c ipft_sn.c ipft_ef.c ipft_td.c \
@@ -6,8 +8,8 @@ SRCS=	ipt.c parse.c common.c fil.c ipft_sn.c ipft_ef.c ipft_td.c \
 	ip_nat.c ip_proxy.c ip_auth.c ipft_hx.c ip_fil.c \
 	natparse.c facpri.c printnat.c printstate.c ip_log.c
 MAN=	ipftest.1
-CPPFLAGS+=-I${.CURDIR}/../../../dist/ipf -DIPFILTER_LKM -DIPFILTER_LOG
+CPPFLAGS+=-I${NETBSDSRCDIR}/dist/ipf -DIPFILTER_LKM -DIPFILTER_LOG
 
-.PATH:	${.CURDIR}/../../../sys/netinet
+.PATH:	${NETBSDSRCDIR}/sys/netinet
 .include <bsd.prog.mk>
 .include <bsd.subdir.mk>
diff --git a/usr.sbin/ipf/ipresend/Makefile b/usr.sbin/ipf/ipresend/Makefile
index c38b751fbcc1..8aa7c3ca6b7a 100644
--- a/usr.sbin/ipf/ipresend/Makefile
+++ b/usr.sbin/ipf/ipresend/Makefile
@@ -1,11 +1,13 @@
-#	$NetBSD: Makefile,v 1.14 2000/05/03 11:40:56 veego Exp $
+#	$NetBSD: Makefile,v 1.15 2002/09/18 03:54:31 lukem Exp $
+
+.include <bsd.own.mk>
 
 PROG=	ipresend
 SRCS=	ipresend.c ip.c resend.c ipft_ef.c ipft_hx.c ipft_pc.c ipft_sn.c \
 	ipft_td.c ipft_tx.c opt.c sbpf.c sock.c 44arp.c
 MAN=	ipresend.1
 
-CPPFLAGS+=-I${.CURDIR}/../../../dist/ipf
+CPPFLAGS+=-I${NETBSDSRCDIR}/dist/ipf
 
-.PATH:	${.CURDIR}/../../../dist/ipf/ipsend
+.PATH:	${NETBSDSRCDIR}/dist/ipf/ipsend
 .include <bsd.prog.mk>
diff --git a/usr.sbin/ipf/ipsend/Makefile b/usr.sbin/ipf/ipsend/Makefile
index 2ccaf8a240a8..590ac77b7bde 100644
--- a/usr.sbin/ipf/ipsend/Makefile
+++ b/usr.sbin/ipf/ipsend/Makefile
@@ -1,4 +1,6 @@
-#	$NetBSD: Makefile,v 1.14 2000/07/04 20:27:37 matt Exp $
+#	$NetBSD: Makefile,v 1.15 2002/09/18 03:54:31 lukem Exp $
+
+.include <bsd.own.mk>
 
 PROG=	ipsend
 SRCS=	ipsend.c ip.c ipsopt.c iplang_l.l iplang_y.y sbpf.c sock.c 44arp.c
@@ -6,14 +8,14 @@ YHEADER=1
 LDADD=	-ll
 DPADD=	${LIBL}
 
-CPPFLAGS+= -I.  -I${.CURDIR}/../../../dist/ipf \
-		-I${.CURDIR}/../../../dist/ipf/ipsend \
-		-I${.CURDIR}/../../../dist/ipf/iplang
+CPPFLAGS+= -I.  -I${NETBSDSRCDIR}/dist/ipf \
+		-I${NETBSDSRCDIR}/dist/ipf/ipsend \
+		-I${NETBSDSRCDIR}/dist/ipf/iplang
 
 MAN=	ipsend.1 ipsend.5
 
-.PATH:	${.CURDIR}/../../../dist/ipf/ipsend \
-	${.CURDIR}/../../../dist/ipf/iplang
+.PATH:	${NETBSDSRCDIR}/dist/ipf/ipsend \
+	${NETBSDSRCDIR}/dist/ipf/iplang
 
 # XXX
 # We have a problem with make and linking ipsend
diff --git a/usr.sbin/ipf/iptest/Makefile b/usr.sbin/ipf/iptest/Makefile
index 95ffda0b1cd2..c2984af9702e 100644
--- a/usr.sbin/ipf/iptest/Makefile
+++ b/usr.sbin/ipf/iptest/Makefile
@@ -1,9 +1,11 @@
-#	$NetBSD: Makefile,v 1.13 2000/05/03 11:40:56 veego Exp $
+#	$NetBSD: Makefile,v 1.14 2002/09/18 03:54:31 lukem Exp $
+
+.include <bsd.own.mk>
 
 PROG=	iptest
 SRCS=	iptest.c iptests.c ip.c sbpf.c sock.c 44arp.c
 MAN=	iptest.1
-CPPFLAGS+=-I${.CURDIR}/../../../dist/ipf
+CPPFLAGS+=-I${NETBSDSRCDIR}/dist/ipf
 
-.PATH:	${.CURDIR}/../../../dist/ipf/ipsend
+.PATH:	${NETBSDSRCDIR}/dist/ipf/ipsend
 .include <bsd.prog.mk>
diff --git a/usr.sbin/ipf/rules/Makefile b/usr.sbin/ipf/rules/Makefile
index 878ddbe57f44..4112a068356e 100644
--- a/usr.sbin/ipf/rules/Makefile
+++ b/usr.sbin/ipf/rules/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2002/04/24 08:18:54 lukem Exp $
+#	$NetBSD: Makefile,v 1.11 2002/09/18 03:54:32 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -13,5 +13,5 @@ FILES=	BASIC.NAT BASIC_1.FW BASIC_2.FW example.1 example.2 example.3 \
 	nat.eg server tcpstate mkfilters
 .endif
 
-.PATH:  ${.CURDIR}/../../../dist/ipf/rules
+.PATH:  ${NETBSDSRCDIR}/dist/ipf/rules
 .include <bsd.prog.mk>
diff --git a/usr.sbin/iteconfig/Makefile b/usr.sbin/iteconfig/Makefile
index 868985106a99..1a890dff230b 100644
--- a/usr.sbin/iteconfig/Makefile
+++ b/usr.sbin/iteconfig/Makefile
@@ -1,8 +1,10 @@
-#   $NetBSD: Makefile,v 1.6 1997/10/25 06:58:18 lukem Exp $
+#   $NetBSD: Makefile,v 1.7 2002/09/18 03:54:32 lukem Exp $
+
+.include <bsd.own.mk>
 
 .if ${MACHINE} == "atari" || ${MACHINE} == "amiga"
 PROG=iteconfig
-CPPFLAGS+=-I${.CURDIR}/../../sys/arch -D${MACHINE}
+CPPFLAGS+=-I${NETBSDSRCDIR}/sys/arch -D${MACHINE}
 .endif
 
 MAN=	iteconfig.8
diff --git a/usr.sbin/kadmin/Makefile b/usr.sbin/kadmin/Makefile
index ec8fbb8dfd3d..94a3bebbce4d 100644
--- a/usr.sbin/kadmin/Makefile
+++ b/usr.sbin/kadmin/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2001/12/12 12:24:30 lukem Exp $
+# $NetBSD: Makefile,v 1.12 2002/09/18 03:54:32 lukem Exp $
 
 NOLINT= # defined
 
 .include <bsd.own.mk>
 
-DIST=		${.CURDIR}/../../crypto/dist
+DIST=		${NETBSDSRCDIR}/crypto/dist
 .PATH: ${DIST}/heimdal/kadmin
 
 WARNS?=  1
@@ -31,12 +31,12 @@ CPPFLAGS+= -I.					\
 	-I${DIST}/heimdal/kadmin		\
 	-I${DIST}/heimdal/lib/krb5		\
 	-I${DIST}/heimdal/lib/asn1		\
-	-I${.CURDIR}/../../include/heimdal	\
+	-I${NETBSDSRCDIR}/include/heimdal	\
 	-I${DESTDIR}/usr/include/kadm5		\
 	-I${DESTDIR}/usr/include/krb5		\
 	-DHAVE_CONFIG_H
 
-VERS!=	cd ${.CURDIR}/../../lib/libvers && ${PRINTOBJDIR}
+VERS!=	cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}
 
 LDADD=	-lkadm5srv \
 	-lhdb \
diff --git a/usr.sbin/kdc/Makefile b/usr.sbin/kdc/Makefile
index 540b3bc3340b..0e0d3ffe178a 100644
--- a/usr.sbin/kdc/Makefile
+++ b/usr.sbin/kdc/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2001/12/12 12:24:30 lukem Exp $
+# $NetBSD: Makefile,v 1.7 2002/09/18 03:54:32 lukem Exp $
 
 NOLINT= # defined
 
 .include <bsd.own.mk>
 
-DIST=		${.CURDIR}/../../crypto/dist
+DIST=		${NETBSDSRCDIR}/crypto/dist
 .PATH: ${DIST}/heimdal/kdc
 
 WARNS?=  1
@@ -24,14 +24,14 @@ SRCS= 	524.c		\
 
 CPPFLAGS+= -I.					\
 	-I${DIST}/heimdal/kdc			\
-	-I${.CURDIR}/../../include/heimdal	\
+	-I${NETBSDSRCDIR}/include/heimdal	\
 	-I${DIST}/heimdal/lib/asn1		\
 	-I${DIST}/heimdal/lib/krb5		\
 	-I${DESTDIR}/usr/include/kerberosIV	\
 	-I${DESTDIR}/usr/include/krb5		\
 	-DHAVE_CONFIG_H
 
-VERS!=	cd ${.CURDIR}/../../lib/libvers && ${PRINTOBJDIR}
+VERS!=	cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}
 
 LDADD=	-lhdb					\
 	-lkrb5					\
diff --git a/usr.sbin/kstash/Makefile b/usr.sbin/kstash/Makefile
index 5e376995f552..1fcfb249f57b 100644
--- a/usr.sbin/kstash/Makefile
+++ b/usr.sbin/kstash/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2002/08/29 14:36:44 itojun Exp $
+# $NetBSD: Makefile,v 1.11 2002/09/18 03:54:32 lukem Exp $
 
 NOLINT= # defined
 
 .include <bsd.own.mk>
 
-DIST=		${.CURDIR}/../../crypto/dist
+DIST=		${NETBSDSRCDIR}/crypto/dist
 .PATH: ${DIST}/heimdal/kdc
 
 WARNS?=  1
@@ -15,14 +15,14 @@ SRCS= kstash.c
 
 CPPFLAGS+= -I.					\
 	-I${DIST}/heimdal/kdc			\
-	-I${.CURDIR}/../../include/heimdal	\
+	-I${NETBSDSRCDIR}/include/heimdal	\
 	-I${DIST}/heimdal/lib/asn1		\
 	-I${DIST}/heimdal/lib/krb5		\
 	-I${DESTDIR}/usr/include/kerberosIV	\
 	-I${DESTDIR}/usr/include/krb5		\
 	-DHAVE_CONFIG_H
 
-VERS!=	cd ${.CURDIR}/../../lib/libvers && ${PRINTOBJDIR}
+VERS!=	cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}
 
 LDADD=	-lhdb \
 	-lkrb5 \
diff --git a/usr.sbin/ktutil/Makefile b/usr.sbin/ktutil/Makefile
index bb2e49141c46..68cafa2fcf0e 100644
--- a/usr.sbin/ktutil/Makefile
+++ b/usr.sbin/ktutil/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2001/12/31 20:04:47 thorpej Exp $
+# $NetBSD: Makefile,v 1.14 2002/09/18 03:54:33 lukem Exp $
 
 NOLINT= # defined
 
 .include <bsd.own.mk>
 
-DIST=		${.CURDIR}/../../crypto/dist
+DIST=		${NETBSDSRCDIR}/crypto/dist
 .PATH: ${DIST}/heimdal/admin
 
 WARNS?=  1
@@ -23,12 +23,12 @@ SRCS=		 add.c				\
 
 CPPFLAGS+= -I.					\
 	-I${DIST}/heimdal/admin			\
-	-I${.CURDIR}/../../include/heimdal	\
+	-I${NETBSDSRCDIR}/include/heimdal	\
 	-I${DESTDIR}/usr/include/kadm5		\
 	-I${DESTDIR}/usr/include/krb5		\
 	-DHAVE_CONFIG_H
 
-VERS!=	cd ${.CURDIR}/../../lib/libvers && ${PRINTOBJDIR}
+VERS!=	cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}
 
 LDADD=	-lkadm5clnt \
 	-lkrb5 \
diff --git a/usr.sbin/lpr/lpd/Makefile b/usr.sbin/lpr/lpd/Makefile
index 0709c14c87ae..f678af3c4771 100644
--- a/usr.sbin/lpr/lpd/Makefile
+++ b/usr.sbin/lpr/lpd/Makefile
@@ -1,6 +1,8 @@
-#	$NetBSD: Makefile,v 1.15 2002/08/12 18:03:41 itojun Exp $
+#	$NetBSD: Makefile,v 1.16 2002/09/18 03:54:33 lukem Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
+.include <bsd.own.mk>
+
 PROG=	lpd
 MAN=	lpd.8
 SRCS=	lpd.c printjob.c recvjob.c lpdchar.c key.c modes.c ttcompat.c rcmd.c
@@ -12,9 +14,9 @@ DPADD+=	${LIBWRAP}
 # the ugly hack is to correctly include lib/libc/include/pathnames.h,
 # not usr.sbin/lpr/common_source/pathnames.h
 rcmd.o: rcmd.c
-	${CC} ${CFLAGS} -I${.CURDIR}/../../../lib/libc/include -DINET6 \
+	${CC} ${CFLAGS} -I${NETBSDSRCDIR}/lib/libc/include -DINET6 \
 	    ${CPPFLAGS} -c ${.IMPSRC}
 
-.PATH:	${.CURDIR}/../../../lib/libc/net
+.PATH:	${NETBSDSRCDIR}/lib/libc/net
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/makefs/Makefile b/usr.sbin/makefs/Makefile
index 7576f45a1065..e6bb34ca2be3 100644
--- a/usr.sbin/makefs/Makefile
+++ b/usr.sbin/makefs/Makefile
@@ -1,6 +1,8 @@
-#	$NetBSD: Makefile,v 1.8 2002/01/31 22:44:02 tv Exp $
+#	$NetBSD: Makefile,v 1.9 2002/09/18 03:54:33 lukem Exp $
 #
 
+.include <bsd.own.mk>
+
 PROG=	makefs
 SRCS=	makefs.c walk.c \
 	ffs.c mkfs.c buf.c \
@@ -8,11 +10,11 @@ SRCS=	makefs.c walk.c \
 	ffs_alloc.c ffs_balloc.c ffs_bswap.c ffs_subr.c ffs_tables.c ufs_bmap.c 
 MAN=	makefs.8
 
-DDSRC=		${.CURDIR}/../../bin/dd
-LSSRC=		${.CURDIR}/../../bin/ls
-MKNODSRC=	${.CURDIR}/../../sbin/mknod
-MTREESRC=	${.CURDIR}/../../usr.sbin/mtree
-UFSSRC=		${.CURDIR}/../../sys/ufs
+DDSRC=		${NETBSDSRCDIR}/bin/dd
+LSSRC=		${NETBSDSRCDIR}/bin/ls
+MKNODSRC=	${NETBSDSRCDIR}/sbin/mknod
+MTREESRC=	${NETBSDSRCDIR}/usr.sbin/mtree
+UFSSRC=		${NETBSDSRCDIR}/sys/ufs
 
 CPPFLAGS+=	-I${.CURDIR} \
 		-I${LSSRC} -I${MKNODSRC} -I${MTREESRC} -I${DDSRC} 
diff --git a/usr.sbin/mscdlabel/Makefile b/usr.sbin/mscdlabel/Makefile
index 633440df172f..8dbb78a288b4 100644
--- a/usr.sbin/mscdlabel/Makefile
+++ b/usr.sbin/mscdlabel/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2002/05/29 19:39:06 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2002/09/18 03:54:33 lukem Exp $
+
+.include <bsd.own.mk>
 
 PROG=	mscdlabel
 SRCS=	main.c dkcksum.c
@@ -6,7 +8,7 @@ LDADD=	-lutil
 MAN=	mscdlabel.8
 WARNS=	1
 
-DISKLABEL_SRC=	${.CURDIR}/../../sbin/disklabel
+DISKLABEL_SRC=	${NETBSDSRCDIR}/sbin/disklabel
 
 .PATH:	${DISKLABEL_SRC}
 CPPFLAGS+=	-I${DISKLABEL_SRC}
diff --git a/usr.sbin/mtree/Makefile b/usr.sbin/mtree/Makefile
index 41e5ceffaa07..e2e7018450f6 100644
--- a/usr.sbin/mtree/Makefile
+++ b/usr.sbin/mtree/Makefile
@@ -1,6 +1,8 @@
-#	$NetBSD: Makefile,v 1.23 2002/01/29 00:07:27 tv Exp $
+#	$NetBSD: Makefile,v 1.24 2002/09/18 03:54:34 lukem Exp $
 #	from: @(#)Makefile	8.2 (Berkeley) 4/27/95
 
+.include <bsd.own.mk>
+
 PROG=	mtree
 #CPPFLAGS+=-DDEBUG
 MAN=	mtree.8
@@ -13,8 +15,8 @@ LDADD+=	-lutil
 DPADD+=	${LIBUTIL}
 .endif
 
-CPPFLAGS+=	-I${.CURDIR}/../../bin/ls -I${.CURDIR}/../../sbin/mknod
-.PATH:	${.CURDIR}/../../bin/ls ${.CURDIR}/../../sbin/mknod
+CPPFLAGS+=	-I${NETBSDSRCDIR}/bin/ls -I${NETBSDSRCDIR}/sbin/mknod
+.PATH:		${NETBSDSRCDIR}/bin/ls ${NETBSDSRCDIR}/sbin/mknod
 
 .ifndef HOSTPROG
 .include <bsd.prog.mk>
diff --git a/usr.sbin/ndp/Makefile b/usr.sbin/ndp/Makefile
index d55da6b53307..256249fe6ef6 100644
--- a/usr.sbin/ndp/Makefile
+++ b/usr.sbin/ndp/Makefile
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2001/06/26 13:43:29 itojun Exp $
+# $NetBSD: Makefile,v 1.4 2002/09/18 03:54:34 lukem Exp $
 
-.PATH:	${.CURDIR}/../../dist/tcpdump
+.include <bsd.own.mk>
+
+.PATH:	${NETBSDSRCDIR}/dist/tcpdump
 
 PROG=	ndp
 SRCS=	ndp.c gmt2local.c
 MAN=	ndp.8
 
 CPPFLAGS+=-DINET6
-CPPFLAGS+=-I. -I${.CURDIR}/../../dist/tcpdump
+CPPFLAGS+=-I. -I${NETBSDSRCDIR}/dist/tcpdump
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/ntp/Makefile.inc b/usr.sbin/ntp/Makefile.inc
index f40b1e9a6bc2..d1bd977d61f7 100644
--- a/usr.sbin/ntp/Makefile.inc
+++ b/usr.sbin/ntp/Makefile.inc
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.7 2002/03/28 09:58:10 jmc Exp $
+#	$NetBSD: Makefile.inc,v 1.8 2002/09/18 03:54:34 lukem Exp $
 
 .if !defined(NTP_MAKEFILE_INC)
 NTP_MAKEFILE_INC=1
@@ -7,13 +7,7 @@ NTP_MAKEFILE_INC=1
 
 NTPDOCDIR?=	${HTMLDOCDIR}/ntp
 
-.if exists(${.CURDIR}/../../../dist/ntp)
-DIST=		${.CURDIR}/../../../dist/ntp
-.elif exists(${.CURDIR}/../../../../dist/ntp)
-DIST=		${.CURDIR}/../../../../dist/ntp
-.else
-# error here?
-.endif
+DIST=		${NETBSDSRCDIR}/dist/ntp
 
 CPPFLAGS+=	-I${.CURDIR}/../include -I${DIST}/include -DHAVE_CONFIG_H
 
diff --git a/usr.sbin/pppd/plugins/minconn/Makefile b/usr.sbin/pppd/plugins/minconn/Makefile
index 4263f2af9590..d78a469b7f0f 100644
--- a/usr.sbin/pppd/plugins/minconn/Makefile
+++ b/usr.sbin/pppd/plugins/minconn/Makefile
@@ -1,6 +1,8 @@
-#	$NetBSD: Makefile,v 1.1 2002/05/29 19:07:12 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2002/09/18 03:54:34 lukem Exp $
 
-PCAPDIR=${.CURDIR}/../../../lib/libpcap
+.include <bsd.own.mk>
+
+PCAPDIR=${NETBSDSRCDIR}/lib/libpcap
 
 NOLINT=yes
 LIBPREFIX=
diff --git a/usr.sbin/pppd/pppd/Makefile b/usr.sbin/pppd/pppd/Makefile
index 1067f8b72260..c0e8b974c72d 100644
--- a/usr.sbin/pppd/pppd/Makefile
+++ b/usr.sbin/pppd/pppd/Makefile
@@ -1,6 +1,8 @@
-#	$NetBSD: Makefile,v 1.29 2002/08/02 02:52:07 christos Exp $
+#	$NetBSD: Makefile,v 1.30 2002/09/18 03:54:35 lukem Exp $
 
-PCAPDIR=${.CURDIR}/../../../lib/libpcap
+.include <bsd.own.mk>
+
+PCAPDIR=${NETBSDSRCDIR}/lib/libpcap
 
 PROG=	pppd
 SRCS=	auth.c cbcp.c ccp.c chap.c chap_ms.c demand.c eui64.c fsm.c \
diff --git a/usr.sbin/pstat/Makefile b/usr.sbin/pstat/Makefile
index 359c9e47da00..4dd194a11c02 100644
--- a/usr.sbin/pstat/Makefile
+++ b/usr.sbin/pstat/Makefile
@@ -1,6 +1,8 @@
-#	$NetBSD: Makefile,v 1.11 1999/09/12 01:19:26 chs Exp $
+#	$NetBSD: Makefile,v 1.12 2002/09/18 03:54:35 lukem Exp $
 #	from: @(#)Makefile	8.1 (Berkeley) 6/6/93
 
+.include <bsd.own.mk>
+
 SRCS=	pstat.c swaplist.c
 PROG=	pstat
 MAN=	pstat.8
@@ -9,8 +11,8 @@ BINMODE=2555
 DPADD=	${LIBKVM}
 LDADD=	-lkvm
 
-CPPFLAGS+=-I${.CURDIR}/../../sbin/swapctl
+CPPFLAGS+=-I${NETBSDSRCDIR}/sbin/swapctl
 
-.PATH: ${.CURDIR}/../../sbin/swapctl
+.PATH: ${NETBSDSRCDIR}/sbin/swapctl
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pwd_mkdb/Makefile b/usr.sbin/pwd_mkdb/Makefile
index 326d550ac8ad..e6bf73cae3c5 100644
--- a/usr.sbin/pwd_mkdb/Makefile
+++ b/usr.sbin/pwd_mkdb/Makefile
@@ -1,9 +1,11 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$NetBSD: Makefile,v 1.16 2002/01/29 10:20:38 tv Exp $
+#	$NetBSD: Makefile,v 1.17 2002/09/18 03:54:35 lukem Exp $
+
+.include <bsd.own.mk>
 
 PROG=	pwd_mkdb
 MAN=	pwd_mkdb.8
-CPPFLAGS+=	-I${.CURDIR}/../../lib/libc/include -D__DBINTERFACE_PRIVATE
+CPPFLAGS+=	-I${NETBSDSRCDIR}/lib/libc/include -D__DBINTERFACE_PRIVATE
 
 .ifndef HOSTPROG
 LDADD+=	-lutil
diff --git a/usr.sbin/quotacheck/Makefile b/usr.sbin/quotacheck/Makefile
index fde987b89680..64edc0a65a63 100644
--- a/usr.sbin/quotacheck/Makefile
+++ b/usr.sbin/quotacheck/Makefile
@@ -1,12 +1,14 @@
-#	$NetBSD: Makefile,v 1.15 1998/03/20 07:43:22 lukem Exp $
+#	$NetBSD: Makefile,v 1.16 2002/09/18 03:54:35 lukem Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
+.include <bsd.own.mk>
+
 PROG=	quotacheck
 SRCS=	quotacheck.c fsutil.c preen.c ffs_bswap.c
 MAN=	quotacheck.8
 DPADD=	${LIBUTIL}
 LDADD+=	-lutil
-CPPFLAGS+=-I${.CURDIR}/../../sbin/fsck
-.PATH:	${.CURDIR}/../../sbin/fsck ${.CURDIR}/../../sys/ufs/ffs
+CPPFLAGS+=-I${NETBSDSRCDIR}/sbin/fsck
+.PATH:	${NETBSDSRCDIR}/sbin/fsck ${NETBSDSRCDIR}/sys/ufs/ffs
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/racoon/Makefile.inc b/usr.sbin/racoon/Makefile.inc
index cf396779dcd6..a949575ba0ff 100644
--- a/usr.sbin/racoon/Makefile.inc
+++ b/usr.sbin/racoon/Makefile.inc
@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile.inc,v 1.8 2002/08/27 14:46:22 lukem Exp $
+#	$NetBSD: Makefile.inc,v 1.9 2002/09/18 03:54:36 lukem Exp $
 
-.include <bsd.own.mk>		# for MKDYNAMICROOT definition
+.include <bsd.own.mk>		# for NETBSDSRCDIR & MKDYNAMICROOT definition
 
 # point top of your KAME tree by ${KAMEROOT}
-LIBPFKEYSRCDIR=	${.CURDIR}/../../../crypto/dist/kame/libipsec
-RACOONSRCDIR=	${.CURDIR}/../../../crypto/dist/kame/racoon
-TCPDUMPSRCDIR=	${.CURDIR}/../../../dist/tcpdump
+LIBPFKEYSRCDIR=	${NETBSDSRCDIR}/crypto/dist/kame/libipsec
+RACOONSRCDIR=	${NETBSDSRCDIR}/crypto/dist/kame/racoon
+TCPDUMPSRCDIR=	${NETBSDSRCDIR}/dist/tcpdump
 
 ETCDIR?=	/etc/racoon
 FILESDIR?=	/usr/share/examples/racoon
diff --git a/usr.sbin/racoon/libpfkey/Makefile b/usr.sbin/racoon/libpfkey/Makefile
index 0058c3ebd004..b28f7b2bddfc 100644
--- a/usr.sbin/racoon/libpfkey/Makefile
+++ b/usr.sbin/racoon/libpfkey/Makefile
@@ -1,4 +1,10 @@
-#	$NetBSD: Makefile,v 1.2 2001/12/12 01:48:55 tv Exp $
+#	$NetBSD: Makefile,v 1.3 2002/09/18 03:54:36 lukem Exp $
+
+NOPIC=		# defined
+NOPROFILE=	# defined
+NOLINT=		# defined
+
+.include <bsd.own.mk>
 
 LIB=	pfkey
 CFLAGS+=-g -Wall -Werror
@@ -14,13 +20,9 @@ SRCS+=	key_debug.c
 #MLINKS+=ipsec_set_policy.3 ipsec_get_policylen.3 \
 #	ipsec_set_policy.3 ipsec_dump_policy.3
 
-NOPIC=# defined
-NOPROFILE=# defined
-NOLINT=# defined
-
 # don't install it into public place!
 libinstall::
 
 .include <bsd.lib.mk>
 
-.PATH:	${LIBPFKEYSRCDIR} ${.CURDIR}/../../../sys/netkey
+.PATH:	${LIBPFKEYSRCDIR} ${NETBSDSRCDIR}/sys/netkey
diff --git a/usr.sbin/rpcbind/Makefile b/usr.sbin/rpcbind/Makefile
index 34ab1fa99f90..48236bf1c95b 100644
--- a/usr.sbin/rpcbind/Makefile
+++ b/usr.sbin/rpcbind/Makefile
@@ -1,4 +1,6 @@
-#	$NetBSD: Makefile,v 1.3 2000/06/20 13:56:43 fvdl Exp $
+#	$NetBSD: Makefile,v 1.4 2002/09/18 03:54:36 lukem Exp $
+
+.include <bsd.own.mk>
 
 PROG=	rpcbind
 MAN=	rpcbind.8
@@ -6,7 +8,7 @@ SRCS=	check_bound.c rpcb_stat.c rpcb_svc_4.c rpcbind.c pmap_svc.c \
 	rpcb_svc.c rpcb_svc_com.c security.c warmstart.c util.c \
 	rpc_generic.c
 
-LIBCDIR=        ${.CURDIR}/../../lib/libc
+LIBCDIR=        ${NETBSDSRCDIR}/lib/libc
 LIBCRPCDIR=     ${LIBCDIR}/rpc
 LIBCINCLUDE=    ${LIBCDIR}/include
 
diff --git a/usr.sbin/rwhod/Makefile b/usr.sbin/rwhod/Makefile
index be92e86c9b9e..45494913043e 100644
--- a/usr.sbin/rwhod/Makefile
+++ b/usr.sbin/rwhod/Makefile
@@ -1,12 +1,14 @@
 #	from: @(#)Makefile	5.3 (Berkeley) 5/11/90
-#	$NetBSD: Makefile,v 1.10 2002/08/02 02:38:15 christos Exp $
+#	$NetBSD: Makefile,v 1.11 2002/09/18 03:54:36 lukem Exp $
+
+.include <bsd.own.mk>
 
 PROG=	rwhod
 SRCS=	rwhod.c utmpentry.c
 MAN=	rwhod.8
 
-.PATH.c: ${.CURDIR}/../../usr.bin/who
-CPPFLAGS+=-I${.CURDIR}/../../usr.bin/who -DSUPPORT_UTMPX -DSUPPORT_UTMP
+.PATH.c: ${NETBSDSRCDIR}/usr.bin/who
+CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/who -DSUPPORT_UTMPX -DSUPPORT_UTMP
 
 LDADD+=	-lutil
 DPADD+=	${LIBUTIL}
diff --git a/usr.sbin/syslogd/Makefile b/usr.sbin/syslogd/Makefile
index 570db001f186..90905d9347bf 100644
--- a/usr.sbin/syslogd/Makefile
+++ b/usr.sbin/syslogd/Makefile
@@ -1,6 +1,8 @@
-#	$NetBSD: Makefile,v 1.17 2002/08/02 02:23:49 christos Exp $
+#	$NetBSD: Makefile,v 1.18 2002/09/18 03:54:37 lukem Exp $
 #	from: @(#)Makefile	8.1 (Berkeley) 6/6/93
 
+.include <bsd.own.mk>
+
 PROG=	syslogd
 SRCS=	syslogd.c utmpentry.c
 MAN=	syslogd.8 syslog.conf.5
@@ -9,8 +11,8 @@ LDADD+=-lutil
 #make symlink to old socket location for transitional period
 SYMLINKS=	/var/run/log /dev/log
 CPPFLAGS+=-DINET6
-.PATH.c: ${.CURDIR}/../../usr.bin/who
-CPPFLAGS+=-I${.CURDIR}/../../usr.bin/who -DSUPPORT_UTMPX -DSUPPORT_UTMP
+.PATH.c: ${NETBSDSRCDIR}/usr.bin/who
+CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/who -DSUPPORT_UTMPX -DSUPPORT_UTMP
 
 CPPFLAGS+=-DLIBWRAP
 LDADD+=	-lwrap
diff --git a/usr.sbin/tcpdchk/Makefile b/usr.sbin/tcpdchk/Makefile
index 48a845e2ff17..2729f694b61e 100644
--- a/usr.sbin/tcpdchk/Makefile
+++ b/usr.sbin/tcpdchk/Makefile
@@ -1,4 +1,6 @@
-#	$NetBSD: Makefile,v 1.11 2002/05/24 09:57:25 tron Exp $
+#	$NetBSD: Makefile,v 1.12 2002/09/18 03:54:37 lukem Exp $
+
+.include <bsd.own.mk>
 
 PROG=	tcpdchk
 SRCS=	tcpdchk.c fakelog.c inetcf.c scaffold.c percent_m.c
@@ -6,8 +8,8 @@ MAN=	tcpdchk.8
 LDADD=	-lwrap
 DPADD=	${LIBWRAP}
 
-CPPFLAGS+= -I${.CURDIR}/../../lib/libwrap -DSYS_ERRLIST_DEFINED
+CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libwrap -DSYS_ERRLIST_DEFINED
 
-.include "${.CURDIR}/../../lib/libwrap/Makefile.cflags"
+.include "${NETBSDSRCDIR}/lib/libwrap/Makefile.cflags"
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/tcpdmatch/Makefile b/usr.sbin/tcpdmatch/Makefile
index 7031e413e85a..e4e7d5f64684 100644
--- a/usr.sbin/tcpdmatch/Makefile
+++ b/usr.sbin/tcpdmatch/Makefile
@@ -1,15 +1,17 @@
-#	$NetBSD: Makefile,v 1.9 2002/05/24 11:29:40 tron Exp $
+#	$NetBSD: Makefile,v 1.10 2002/09/18 03:54:38 lukem Exp $
 #
 
+.include <bsd.own.mk>
+
 PROG=	tcpdmatch
 SRCS=	tcpdmatch.c fakelog.c inetcf.c scaffold.c percent_m.c
 MAN=	tcpdmatch.8
 TCPDCHK=${.CURDIR}/../tcpdchk
 .PATH: ${TCPDCHK}
-CPPFLAGS+= -I${TCPDCHK} -I${.CURDIR}/../../lib/libwrap -DSYS_ERRLIST_DEFINED
+CPPFLAGS+= -I${TCPDCHK} -I${NETBSDSRCDIR}/lib/libwrap -DSYS_ERRLIST_DEFINED
 LDADD=	-lwrap
 DPADD=	${LIBWRAP}
 
-.include "${.CURDIR}/../../lib/libwrap/Makefile.cflags"
+.include "${NETBSDSRCDIR}/lib/libwrap/Makefile.cflags"
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/tcpdump/Makefile b/usr.sbin/tcpdump/Makefile
index c1aa28090e1d..af2099257870 100644
--- a/usr.sbin/tcpdump/Makefile
+++ b/usr.sbin/tcpdump/Makefile
@@ -1,8 +1,8 @@
-#	$NetBSD: Makefile,v 1.28 2002/05/31 09:45:47 itojun Exp $	
+#	$NetBSD: Makefile,v 1.29 2002/09/18 03:54:38 lukem Exp $	
 
 .include <bsd.own.mk>
 
-SRCDIR=	${.CURDIR}/../../dist/tcpdump
+SRCDIR=	${NETBSDSRCDIR}/dist/tcpdump
 .PATH:	${SRCDIR}
 
 PROG=	tcpdump
diff --git a/usr.sbin/videomode/Makefile b/usr.sbin/videomode/Makefile
index bfd49821d440..a499a92bf16e 100644
--- a/usr.sbin/videomode/Makefile
+++ b/usr.sbin/videomode/Makefile
@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile,v 1.6 2001/12/12 01:48:56 tv Exp $
+#	$NetBSD: Makefile,v 1.7 2002/09/18 03:54:38 lukem Exp $
+
+NOMAN=	# defined
+.include <bsd.own.mk>
 
 .if ${MACHINE} == "amiga"
 PROG=videomode
-CPPFLAGS+=-I${.CURDIR}/../../sys/arch -D${MACHINE}
-.else
-NOOBJ=	# defined
+CPPFLAGS+=-I${NETBSDSRCDIR}/sys/arch -D${MACHINE}
 .endif
-NOMAN=	# defined
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/ypserv/ypserv/Makefile b/usr.sbin/ypserv/ypserv/Makefile
index 6a8236af22f5..a5ac3f268e47 100644
--- a/usr.sbin/ypserv/ypserv/Makefile
+++ b/usr.sbin/ypserv/ypserv/Makefile
@@ -1,11 +1,13 @@
-#	$NetBSD: Makefile,v 1.13 2001/01/12 01:43:48 cgd Exp $
+#	$NetBSD: Makefile,v 1.14 2002/09/18 03:54:38 lukem Exp $
+
+.include <bsd.own.mk>
 
 PROG=	ypserv
 SRCS=	ypserv.c ypserv_proc.c ypserv_db.c ypserv_xdr.c \
 	gethnamaddr.c getnetnamadr.c
 MAN=	ypserv.8
 
-LIBCDIR=${.CURDIR}/../../../lib/libc
+LIBCDIR=${NETBSDSRCDIR}/lib/libc
 .PATH:	${LIBCDIR}/net
 CPPFLAGS+=-DYY_NO_UNPUT -DOPTIMIZE_DB -DLIBWRAP -I. -I${LIBCDIR}/include
 YHEADER=1
diff --git a/usr.sbin/zdump/Makefile b/usr.sbin/zdump/Makefile
index 7bda968ce366..22f06547f4b7 100644
--- a/usr.sbin/zdump/Makefile
+++ b/usr.sbin/zdump/Makefile
@@ -1,8 +1,10 @@
-#	$NetBSD: Makefile,v 1.4 1997/05/08 21:12:59 gwr Exp $
+#	$NetBSD: Makefile,v 1.5 2002/09/18 03:54:39 lukem Exp $
+
+.include <bsd.own.mk>
 
 PROG=	zdump
 SRCS=	zdump.c ialloc.c
 MAN=	zdump.8
 
-.PATH: ${.CURDIR}/../../lib/libc/time
+.PATH: ${NETBSDSRCDIR}/lib/libc/time
 .include <bsd.prog.mk>
diff --git a/usr.sbin/zic/Makefile b/usr.sbin/zic/Makefile
index 61645132117e..6abbaf972839 100644
--- a/usr.sbin/zic/Makefile
+++ b/usr.sbin/zic/Makefile
@@ -1,11 +1,13 @@
-#	$NetBSD: Makefile,v 1.6 2002/01/05 07:37:45 mrg Exp $
+#	$NetBSD: Makefile,v 1.7 2002/09/18 03:54:39 lukem Exp $
+
+.include <bsd.own.mk>
 
 PROG=	zic
 SRCS=	zic.c scheck.c ialloc.c
 MAN=	zic.8
 CPPFLAGS+=-Dunix
 
-.PATH: ${.CURDIR}/../../lib/libc/time
+.PATH: ${NETBSDSRCDIR}/lib/libc/time
 
 .ifndef HOSTPROG
 .include <bsd.prog.mk>