Use ${NETBSDSRCDIR}/some/path instead of ${.CURDIR}/../../some/path

2002-08-19 10:16:51 +00:00 · 2002-08-19 10:16:51 +00:00 · 7360d7b6ae
commit 7360d7b6ae
parent 337a91ae52
39 changed files with 174 additions and 99 deletions
--- a/sbin/badsect/Makefile
+++ b/sbin/badsect/Makefile
@ -1,9 +1,11 @@
-#	$NetBSD: Makefile,v 1.12 1999/01/15 13:32:05 bouyer Exp $
+#	$NetBSD: Makefile,v 1.13 2002/08/19 10:16:51 lukem Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93

+.include <bsd.own.mk>
+
 PROG=	badsect
 SRCS=	badsect.c ffs_bswap.c
 MAN=	badsect.8
-.PATH:  ${.CURDIR}/../../sys/ufs/ffs
+.PATH:  ${NETBSDSRCDIR}/sys/ufs/ffs

 .include <bsd.prog.mk>
--- a/sbin/clri/Makefile
+++ b/sbin/clri/Makefile
@ -1,9 +1,11 @@
-#	$NetBSD: Makefile,v 1.9 1999/01/15 13:32:05 bouyer Exp $
+#	$NetBSD: Makefile,v 1.10 2002/08/19 10:16:52 lukem Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93

+.include <bsd.own.mk>
+
 PROG=	clri
 MAN=	clri.8
 SRCS=	clri.c ffs_bswap.c
-.PATH:  ${.CURDIR}/../../sys/ufs/ffs
+.PATH:  ${NETBSDSRCDIR}/sys/ufs/ffs

 .include <bsd.prog.mk>
--- a/sbin/dump/Makefile
+++ b/sbin/dump/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.28 2002/08/02 02:07:09 christos Exp $
+#	$NetBSD: Makefile,v 1.29 2002/08/19 10:16:52 lukem Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93

 #	dump.h			header file
@ -20,10 +20,12 @@
 #	STATS			read cache statistics
 #	DIAGNOSTICS		read cache diagnostic checks

+.include <bsd.own.mk>
+
 PROG=	dump
 LINKS=	${BINDIR}/dump ${BINDIR}/rdump
 CPPFLAGS+=-DRDUMP -I${.CURDIR}
-CPPFLAGS+=-I${.CURDIR}/../../usr.bin/who -DSUPPORT_UTMPX -DSUPPORT_UTMP
+CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/who -DSUPPORT_UTMPX -DSUPPORT_UTMP
 # CPPFLAGS+= -DDEBUG -DTDEBUG -DFDEBUG -DWRITEDEBUG -DSTATS -DDIAGNOSTICS
 SRCS=	itime.c main.c optr.c dumprmt.c rcache.c tape.c traverse.c unctime.c \
 	ffs_inode.c ffs_bswap.c utmpentry.c
@ -32,6 +34,6 @@ BINMODE=2555
 MAN=	dump.8
 MLINKS+=dump.8 rdump.8

-.PATH:  ${.CURDIR}/../../sys/ufs/ffs ${.CURDIR}/../../usr.bin/who
+.PATH:  ${NETBSDSRCDIR}/sys/ufs/ffs ${NETBSDSRCDIR}/usr.bin/who

 .include <bsd.prog.mk>
--- a/sbin/dump_lfs/Makefile
+++ b/sbin/dump_lfs/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2002/08/02 12:29:36 scw Exp $
+#	$NetBSD: Makefile,v 1.4 2002/08/19 10:16:53 lukem Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93

 #	lfs_inode.c		LFS filestore-specific routines
@ -6,11 +6,13 @@
 #	DEBUG			use local directory to find ddate and dumpdates
 #	TDEBUG			trace out the process forking

+.include <bsd.own.mk>
+
 PROG=	dump_lfs
 LINKS=	${BINDIR}/dump_lfs ${BINDIR}/rdump_lfs
-CPPFLAGS+=-DRDUMP -I${.CURDIR} -I${.CURDIR}/../dump
+CPPFLAGS+=-DRDUMP -I${.CURDIR} -I${NETBSDSRCDIR}/sbin/dump
 CPPFLAGS+=-DDUMP_LFS
-CPPFLAGS+=-I${.CURDIR}/../../usr.bin/who -DSUPPORT_UTMPX -DSUPPORT_UTMP
+CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/who -DSUPPORT_UTMPX -DSUPPORT_UTMP
 # CPPFLAGS+= -DDEBUG -DTDEBUG -DFDEBUG -DWRITEDEBUG -DSTATS -DDIAGNOSTICS
 SRCS=	itime.c main.c optr.c dumprmt.c rcache.c tape.c traverse.c unctime.c \
 	ffs_bswap.c lfs_inode.c utmpentry.c
@ -20,6 +22,7 @@ MAN=	dump_lfs.8
 MLINKS+=dump_lfs.8 rdump_lfs.8
 CFLAGS+=-g

-.PATH:  ${.CURDIR}/../dump ${.CURDIR}/../../sys/ufs/lfs ${.CURDIR}/../../sys/ufs/ffs ${.CURDIR}/../../usr.bin/who
+.PATH:  ${NETBSDSRCDIR}/sbin/dump ${NETBSDSRCDIR}/sys/ufs/lfs \
+	${NETBSDSRCDIR}/sys/ufs/ffs ${NETBSDSRCDIR}/usr.bin/who

 .include <bsd.prog.mk>
--- a/sbin/fsck_ext2fs/Makefile
+++ b/sbin/fsck_ext2fs/Makefile
@ -1,12 +1,14 @@
-#	$NetBSD: Makefile,v 1.8 2000/01/28 16:01:46 bouyer Exp $
+#	$NetBSD: Makefile,v 1.9 2002/08/19 10:16:53 lukem Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93

+.include <bsd.own.mk>
+
 PROG=	fsck_ext2fs
 MAN=    fsck_ext2fs.8
 SRCS=	dir.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c pass4.c \
 	pass5.c fsutil.c setup.c utilities.c ext2fs_bswap.c
-FSCK=	${.CURDIR}/../fsck
+FSCK=	${NETBSDSRCDIR}/sbin/fsck
 CPPFLAGS+= -I${FSCK}
-.PATH:	${.CURDIR}/../../sys/ufs/ext2fs ${FSCK}
+.PATH:	${NETBSDSRCDIR}/sys/ufs/ext2fs ${FSCK}

 .include <bsd.prog.mk>
--- a/sbin/fsck_ffs/Makefile
+++ b/sbin/fsck_ffs/Makefile
@ -1,13 +1,15 @@
-#	$NetBSD: Makefile,v 1.22 1999/01/15 13:32:06 bouyer Exp $
+#	$NetBSD: Makefile,v 1.23 2002/08/19 10:16:53 lukem Exp $
 #	@(#)Makefile	8.2 (Berkeley) 4/27/95

+.include <bsd.own.mk>
+
 PROG=	fsck_ffs
 MAN=	fsck_ffs.8
 SRCS=	dir.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c pass4.c \
 	pass5.c fsutil.c setup.c utilities.c ffs_bswap.c ffs_subr.c ffs_tables.c
-FSCK=	${.CURDIR}/../fsck
+FSCK=	${NETBSDSRCDIR}/sbin/fsck
 CPPFLAGS+=-I${FSCK}
-.PATH:	${.CURDIR}/../../sys/ufs/ffs ${FSCK}
+.PATH:	${NETBSDSRCDIR}/sys/ufs/ffs ${FSCK}


 .if make(install)
--- a/sbin/fsck_lfs/Makefile
+++ b/sbin/fsck_lfs/Makefile
@ -1,13 +1,15 @@
-#	$NetBSD: Makefile,v 1.4 2000/10/19 14:58:40 fvdl Exp $
+#	$NetBSD: Makefile,v 1.5 2002/08/19 10:16:53 lukem Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93

+.include <bsd.own.mk>
+
 PROG=	fsck_lfs
 MAN=	fsck_lfs.8
 SRCS=	dir.c inode.c main.c pass1.c pass2.c pass3.c pass4.c \
 	fsutil.c setup.c utilities.c lfs_cksum.c vars.c
 SRCS+=  pass0.c pass5.c
-FSCK=   ${.CURDIR}/../fsck
-.PATH:	${.CURDIR}/../../sys/ufs/lfs ${FSCK}
+FSCK=   ${NETBSDSRCDIR}/sbin/fsck
+.PATH:	${NETBSDSRCDIR}/sys/ufs/lfs ${FSCK}
 CPPFLAGS+=-I${FSCK} # -DVERBOSE_BLOCKMAP

 .include <bsd.prog.mk>
--- a/sbin/fsck_msdos/Makefile
+++ b/sbin/fsck_msdos/Makefile
@ -1,4 +1,6 @@
-#	$NetBSD: Makefile,v 1.8 2001/04/06 16:52:41 wiz Exp $
+#	$NetBSD: Makefile,v 1.9 2002/08/19 10:16:54 lukem Exp $
+
+.include <bsd.own.mk>

 PROG=	fsck_msdos
 MAN=	fsck_msdos.8
@ -6,7 +8,7 @@ SRCS=	main.c check.c boot.c fat.c dir.c fsutil.c

 WARNS=	2

-FSCK=	${.CURDIR}/../fsck
+FSCK=	${NETBSDSRCDIR}/sbin/fsck
 CPPFLAGS+= -I${FSCK}
 .PATH:	${FSCK}

--- a/sbin/fsdb/Makefile
+++ b/sbin/fsdb/Makefile
@ -1,6 +1,8 @@
-#	$NetBSD: Makefile,v 1.12 1999/01/15 13:32:06 bouyer Exp $
+#	$NetBSD: Makefile,v 1.13 2002/08/19 10:16:54 lukem Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93

+.include <bsd.own.mk>
+
 PROG=	fsdb
 MAN=	fsdb.8
 SRCS=	fsdb.c fsdbutil.c
@ -9,10 +11,10 @@ SRCS+=	dir.c inode.c pass1.c pass1b.c pass2.c pass3.c pass4.c \
 SRCS+=	ffs_bswap.c ffs_subr.c ffs_tables.c
 SRCS+=	fsutil.c 

-FSCK=	${.CURDIR}/../fsck
-FSCK_FFS=${.CURDIR}/../fsck_ffs
+FSCK=	${NETBSDSRCDIR}/sbin/fsck
+FSCK_FFS=${NETBSDSRCDIR}/sbin/fsck_ffs
 CPPFLAGS+= -I${FSCK} -I${FSCK_FFS}
-.PATH:	${FSCK} ${FSCK_FFS} ${.CURDIR}/../../sys/ufs/ffs
+.PATH:	${FSCK} ${FSCK_FFS} ${NETBSDSRCDIR}/sys/ufs/ffs

 LDADD+= -ledit -ltermcap
 DPADD+= ${LIBEDIT} ${LIBTERMCAP}
--- a/sbin/fsirand/Makefile
+++ b/sbin/fsirand/Makefile
@ -1,4 +1,6 @@
-#	$NetBSD: Makefile,v 1.5 2001/11/16 04:25:42 lukem Exp $
+#	$NetBSD: Makefile,v 1.6 2002/08/19 10:16:54 lukem Exp $
+
+.include <bsd.own.mk>

 PROG=	fsirand
 SRCS=	fsirand.c ffs_bswap.c
@ -8,6 +10,6 @@ LDADD+=	-lutil

 WARNS=	2

-.PATH:  ${.CURDIR}/../../sys/ufs/ffs
+.PATH:  ${NETBSDSRCDIR}/sys/ufs/ffs

 .include <bsd.prog.mk>
--- a/sbin/ldconfig/Makefile
+++ b/sbin/ldconfig/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.19 2002/02/24 03:18:44 matt Exp $
+#	$NetBSD: Makefile,v 1.20 2002/08/19 10:16:54 lukem Exp $

 .include <bsd.own.mk>   # For OBJECT_FMT

@ -13,8 +13,8 @@
 PROG=	ldconfig
 SRCS=	ldconfig.c shlib.c

-CPPFLAGS += -I$(.CURDIR)/../../libexec/ld.aout_so
-.PATH:	$(.CURDIR)/../../libexec/ld.aout_so
+CPPFLAGS += -I${NETBSDSRCDIR}/libexec/ld.aout_so
+.PATH:	${NETBSDSRCDIR}/libexec/ld.aout_so

 .endif

--- a/sbin/mbrlabel/Makefile
+++ b/sbin/mbrlabel/Makefile
@ -1,6 +1,8 @@
-#	$NetBSD: Makefile,v 1.3 2000/12/24 13:57:37 lukem Exp $
+#	$NetBSD: Makefile,v 1.4 2002/08/19 10:16:55 lukem Exp $

-DISKLABELPATH=	${.CURDIR}/../../sbin/disklabel
+.include <bsd.own.mk>
+
+DISKLABELPATH=	${NETBSDSRCDIR}/sbin/disklabel
 PROG=	mbrlabel
 SRCS=	mbrlabel.c dkcksum.c printlabel.c
 CPPFLAGS+= -I${DISKLABELPATH}
--- a/sbin/mount/Makefile
+++ b/sbin/mount/Makefile
@ -1,6 +1,8 @@
-#	$NetBSD: Makefile,v 1.20 2001/02/20 23:24:47 cgd Exp $
+#	$NetBSD: Makefile,v 1.21 2002/08/19 10:16:55 lukem Exp $
 #	@(#)Makefile	8.6 (Berkeley) 5/8/95

+.include <bsd.own.mk>
+
 PROG=	mount
 MAN=	mount.8
 SRCS=	mount.c vfslist.c
@ -21,7 +23,7 @@ MOUNT_PROGS=	mount_ados mount_cd9660 mount_ext2fs mount_fdesc mount_ffs \
 	
 # include individual source files and manpages to build process
 .for p in ${MOUNT_PROGS}
-.PATH: ${.CURDIR}/../${p}
+.PATH: ${NETBSDSRCDIR}/sbin/${p}
 SRCS+=	${p}.c
 MAN+=	${p}.8
 LINKS+=	${BINDIR}/${PROG} ${BINDIR}/${p}
--- a/sbin/mount_ados/Makefile
+++ b/sbin/mount_ados/Makefile
@ -1,11 +1,13 @@
-#	$NetBSD: Makefile,v 1.9 2000/10/30 20:56:58 jdolecek Exp $
+#	$NetBSD: Makefile,v 1.10 2002/08/19 10:16:55 lukem Exp $
+
+.include <bsd.own.mk>

 PROG=	mount_ados
 SRCS=	mount_ados.c getmntopts.c fattr.c
 MAN=	mount_ados.8

-MOUNT=	${.CURDIR}/../mount
-CPPFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT}
+MOUNT=	${NETBSDSRCDIR}/sbin/mount
+CPPFLAGS+= -I${NETBSDSRCDIR}/sys -I${MOUNT}
 .PATH:	${MOUNT}

 .include <bsd.prog.mk>
--- a/sbin/mount_cd9660/Makefile
+++ b/sbin/mount_cd9660/Makefile
@ -1,11 +1,13 @@
-#	$NetBSD: Makefile,v 1.6 1997/10/10 19:49:10 christos Exp $
+#	$NetBSD: Makefile,v 1.7 2002/08/19 10:16:55 lukem Exp $
 #	@(#)Makefile	8.3 (Berkeley) 3/27/94

+.include <bsd.own.mk>
+
 PROG=	mount_cd9660
 SRCS=	mount_cd9660.c getmntopts.c
 MAN=	mount_cd9660.8

-MOUNT=	${.CURDIR}/../mount
+MOUNT=	${NETBSDSRCDIR}/sbin/mount
 CPPFLAGS+= -I${MOUNT}
 .PATH:	${MOUNT}

--- a/sbin/mount_ext2fs/Makefile
+++ b/sbin/mount_ext2fs/Makefile
@ -1,12 +1,14 @@
-#	$NetBSD: Makefile,v 1.3 1998/01/09 08:04:01 perry Exp $
+#	$NetBSD: Makefile,v 1.4 2002/08/19 10:16:56 lukem Exp $
 #
 #	$OpenBSD: Makefile,v 1.1 1996/06/27 07:20:28 downsj Exp $

+.include <bsd.own.mk>
+
 PROG=	mount_ext2fs
 SRCS=	mount_ext2fs.c getmntopts.c
 MAN=	mount_ext2fs.8

-MOUNT=	${.CURDIR}/../mount
+MOUNT=	${NETBSDSRCDIR}/sbin/mount
 CPPFLAGS+= -I${MOUNT}
 .PATH:	${MOUNT}

--- a/sbin/mount_fdesc/Makefile
+++ b/sbin/mount_fdesc/Makefile
@ -1,11 +1,13 @@
-#	$NetBSD: Makefile,v 1.9 1997/10/10 19:49:31 christos Exp $
+#	$NetBSD: Makefile,v 1.10 2002/08/19 10:16:56 lukem Exp $
 #	@(#)Makefile	8.2 (Berkeley) 3/27/94

+.include <bsd.own.mk>
+
 PROG=	mount_fdesc
 SRCS=	mount_fdesc.c getmntopts.c
 MAN=	mount_fdesc.8

-MOUNT=	${.CURDIR}/../mount
+MOUNT=	${NETBSDSRCDIR}/sbin/mount
 CPPFLAGS+= -I${MOUNT}
 .PATH:	${MOUNT}

--- a/sbin/mount_ffs/Makefile
+++ b/sbin/mount_ffs/Makefile
@ -1,4 +1,6 @@
-#	$NetBSD: Makefile,v 1.4 1997/10/10 19:49:44 christos Exp $
+#	$NetBSD: Makefile,v 1.5 2002/08/19 10:16:56 lukem Exp $
+
+.include <bsd.own.mk>

 PROG=	mount_ffs
 SRCS=	mount_ffs.c getmntopts.c
@ -7,7 +9,7 @@ MAN=	mount_ffs.8
 MLINKS=	mount_ffs.8 mount_ufs.8
 LINKS=  ${BINDIR}/mount_ffs ${BINDIR}/mount_ufs

-MOUNT=	${.CURDIR}/../mount
+MOUNT=	${NETBSDSRCDIR}/sbin/mount
 CPPFLAGS+= -I${MOUNT}
 .PATH:	${MOUNT}

--- a/sbin/mount_filecore/Makefile
+++ b/sbin/mount_filecore/Makefile
@ -1,12 +1,14 @@
-#	$NetBSD: Makefile,v 1.3 2000/10/30 20:56:59 jdolecek Exp $
+#	$NetBSD: Makefile,v 1.4 2002/08/19 10:16:57 lukem Exp $
 #
 #	Makefile	1.0	1998/6/26

+.include <bsd.own.mk>
+
 PROG=	mount_filecore
 SRCS=	mount_filecore.c getmntopts.c fattr.c
 MAN=	mount_filecore.8

-MOUNT=	${.CURDIR}/../mount
+MOUNT=	${NETBSDSRCDIR}/sbin/mount
 CPPFLAGS+= -I${MOUNT}
 .PATH: ${MOUNT}

--- a/sbin/mount_kernfs/Makefile
+++ b/sbin/mount_kernfs/Makefile
@ -1,11 +1,13 @@
-#	$NetBSD: Makefile,v 1.9 1997/10/10 19:49:57 christos Exp $
+#	$NetBSD: Makefile,v 1.10 2002/08/19 10:16:57 lukem Exp $
 #	@(#)Makefile	8.2 (Berkeley) 3/27/94

+.include <bsd.own.mk>
+
 PROG=	mount_kernfs
 SRCS=	mount_kernfs.c getmntopts.c
 MAN=	mount_kernfs.8

-MOUNT=	${.CURDIR}/../mount
+MOUNT=	${NETBSDSRCDIR}/sbin/mount
 CPPFLAGS+= -I${MOUNT}
 .PATH:	${MOUNT}

--- a/sbin/mount_lfs/Makefile
+++ b/sbin/mount_lfs/Makefile
@ -1,11 +1,13 @@
-#	$NetBSD: Makefile,v 1.6 1997/10/10 19:50:12 christos Exp $
+#	$NetBSD: Makefile,v 1.7 2002/08/19 10:16:57 lukem Exp $
 #	@(#)Makefile	8.2 (Berkeley) 3/27/94

+.include <bsd.own.mk>
+
 PROG=	mount_lfs
 SRCS=	mount_lfs.c getmntopts.c
 MAN=	mount_lfs.8

-MOUNT=	${.CURDIR}/../mount
+MOUNT=	${NETBSDSRCDIR}/sbin/mount
 CPPFLAGS+= -I${MOUNT}
 .PATH:	${MOUNT}

--- a/sbin/mount_msdos/Makefile
+++ b/sbin/mount_msdos/Makefile
@ -1,11 +1,13 @@
-#	$NetBSD: Makefile,v 1.15 2000/10/30 20:57:00 jdolecek Exp $
+#	$NetBSD: Makefile,v 1.16 2002/08/19 10:16:57 lukem Exp $
+
+.include <bsd.own.mk>

 PROG=	mount_msdos
 SRCS=	mount_msdos.c getmntopts.c fattr.c
 MAN=	mount_msdos.8

-MOUNT=	${.CURDIR}/../mount
-CPPFLAGS+= -I${MOUNT} -I${.CURDIR}/../../sys
+MOUNT=	${NETBSDSRCDIR}/sbin/mount
+CPPFLAGS+= -I${MOUNT} -I${NETBSDSRCDIR}/sys
 .PATH:	${MOUNT}

 .include <bsd.prog.mk>
--- a/sbin/mount_nfs/Makefile
+++ b/sbin/mount_nfs/Makefile
@ -1,11 +1,13 @@
-#	$NetBSD: Makefile,v 1.10 1997/10/10 19:50:38 christos Exp $
+#	$NetBSD: Makefile,v 1.11 2002/08/19 10:16:57 lukem Exp $
 #	@(#)Makefile	8.2 (Berkeley) 3/27/94

+.include <bsd.own.mk>
+
 PROG=	mount_nfs
 SRCS=	mount_nfs.c getmntopts.c
 MAN=	mount_nfs.8

-MOUNT=	${.CURDIR}/../mount
+MOUNT=	${NETBSDSRCDIR}/sbin/mount
 CPPFLAGS+= -DNFS -I${MOUNT}
 .PATH:	${MOUNT}

--- a/sbin/mount_ntfs/Makefile
+++ b/sbin/mount_ntfs/Makefile
@ -1,13 +1,15 @@
-#	$NetBSD: Makefile,v 1.4 2000/10/30 20:57:00 jdolecek Exp $
+#	$NetBSD: Makefile,v 1.5 2002/08/19 10:16:58 lukem Exp $
 #
 #	Id: Makefile,v 1.1.1.1 1999/02/03 03:51:19 semenu Exp 
 #

+.include <bsd.own.mk>
+
 PROG=	mount_ntfs
 SRCS=	mount_ntfs.c getmntopts.c fattr.c
 MAN=	mount_ntfs.8

-MOUNT=	${.CURDIR}/../mount
+MOUNT=	${NETBSDSRCDIR}/sbin/mount
 CPPFLAGS+= -I${MOUNT}
 .PATH:	${MOUNT}

--- a/sbin/mount_null/Makefile
+++ b/sbin/mount_null/Makefile
@ -1,12 +1,14 @@
-#	$NetBSD: Makefile,v 1.8 1997/10/10 19:50:52 christos Exp $
+#	$NetBSD: Makefile,v 1.9 2002/08/19 10:16:58 lukem Exp $
 #	@(#)Makefile	8.3 (Berkeley) 3/27/94

+.include <bsd.own.mk>
+
 PROG=	mount_null
 SRCS=	mount_null.c getmntopts.c
 MAN=	mount_null.8

-MOUNT=	${.CURDIR}/../mount
-CPPFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT}
+MOUNT=	${NETBSDSRCDIR}/sbin/mount
+CPPFLAGS+= -I${NETBSDSRCDIR}/sys -I${MOUNT}
 .PATH:	${MOUNT}

 .include <bsd.prog.mk>
--- a/sbin/mount_overlay/Makefile
+++ b/sbin/mount_overlay/Makefile
@ -1,12 +1,14 @@
-#	$NetBSD: Makefile,v 1.1 2000/01/20 19:22:10 wrstuden Exp $
+#	$NetBSD: Makefile,v 1.2 2002/08/19 10:16:58 lukem Exp $
 #	@(#)Makefile	8.3 (Berkeley) 3/27/94

+.include <bsd.own.mk>
+
 PROG=	mount_overlay
 SRCS=	mount_overlay.c getmntopts.c
 MAN=	mount_overlay.8

-MOUNT=	${.CURDIR}/../mount
-CPPFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT}
+MOUNT=	${NETBSDSRCDIR}/sbin/mount
+CPPFLAGS+= -I${NETBSDSRCDIR}/sys -I${MOUNT}
 .PATH:	${MOUNT}

 .include <bsd.prog.mk>
--- a/sbin/mount_portal/Makefile
+++ b/sbin/mount_portal/Makefile
@ -1,6 +1,8 @@
-#	$NetBSD: Makefile,v 1.18 2000/12/31 06:03:52 itojun Exp $
+#	$NetBSD: Makefile,v 1.19 2002/08/19 10:16:58 lukem Exp $
 #	@(#)Makefile	8.3 (Berkeley) 3/27/94

+.include <bsd.own.mk>
+
 PROG=	mount_portal
 SRCS=	mount_portal.c activate.c conf.c getmntopts.c pt_conf.c \
 	pt_exec.c pt_file.c pt_tcp.c pt_filter.c
@ -8,8 +10,8 @@ SUBDIR= examples

 MAN=	mount_portal.8

-MOUNT=	${.CURDIR}/../mount
-CPPFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT}
+MOUNT=	${NETBSDSRCDIR}/sbin/mount
+CPPFLAGS+= -I${NETBSDSRCDIR}/sys -I${MOUNT}
 .PATH:	${MOUNT}
 CPPFLAGS+= -DINET6

--- a/sbin/mount_procfs/Makefile
+++ b/sbin/mount_procfs/Makefile
@ -1,11 +1,13 @@
-#	$NetBSD: Makefile,v 1.9 1997/10/10 19:51:16 christos Exp $
+#	$NetBSD: Makefile,v 1.10 2002/08/19 10:16:59 lukem Exp $
 #	@(#)Makefile	8.4 (Berkeley) 3/27/94

+.include <bsd.own.mk>
+
 PROG=	mount_procfs
 SRCS=	mount_procfs.c getmntopts.c
 MAN=	mount_procfs.8

-MOUNT=	${.CURDIR}/../mount
+MOUNT=	${NETBSDSRCDIR}/sbin/mount
 CPPFLAGS+= -I${MOUNT}
 .PATH:	${MOUNT}

--- a/sbin/mount_umap/Makefile
+++ b/sbin/mount_umap/Makefile
@ -1,12 +1,14 @@
-#	$NetBSD: Makefile,v 1.7 1997/10/10 19:51:28 christos Exp $
+#	$NetBSD: Makefile,v 1.8 2002/08/19 10:16:59 lukem Exp $
 #	@(#)Makefile	8.3 (Berkeley) 3/27/94

+.include <bsd.own.mk>
+
 PROG=	mount_umap
 SRCS=	mount_umap.c getmntopts.c
 MAN=	mount_umap.8

-MOUNT=	${.CURDIR}/../mount
-CPPFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT}
+MOUNT=	${NETBSDSRCDIR}/sbin/mount
+CPPFLAGS+= -I${NETBSDSRCDIR}/sys -I${MOUNT}
 .PATH:	${MOUNT}

 .include <bsd.prog.mk>
--- a/sbin/mount_union/Makefile
+++ b/sbin/mount_union/Makefile
@ -1,12 +1,14 @@
-#	$NetBSD: Makefile,v 1.9 1997/10/10 19:51:39 christos Exp $
+#	$NetBSD: Makefile,v 1.10 2002/08/19 10:16:59 lukem Exp $
 #	@(#)Makefile	8.4 (Berkeley) 7/13/94

+.include <bsd.own.mk>
+
 PROG=	mount_union
 SRCS=	mount_union.c getmntopts.c
 MAN=	mount_union.8

-MOUNT=	${.CURDIR}/../mount
-CPPFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT}
+MOUNT=	${NETBSDSRCDIR}/sbin/mount
+CPPFLAGS+= -I${NETBSDSRCDIR}/sys -I${MOUNT}
 .PATH:	${MOUNT}

 .include <bsd.prog.mk>
--- a/sbin/newfs/Makefile
+++ b/sbin/newfs/Makefile
@ -1,18 +1,20 @@
-#	$NetBSD: Makefile,v 1.22 2002/01/08 20:54:49 thorpej Exp $
+#	$NetBSD: Makefile,v 1.23 2002/08/19 10:16:59 lukem Exp $
 #	@(#)Makefile	8.2 (Berkeley) 3/27/94

+.include <bsd.own.mk>
+
 PROG=	newfs
 SRCS=	dkcksum.c getmntopts.c newfs.c mkfs.c ffs_bswap.c
 MAN=	newfs.8 mount_mfs.8

 WARNS=	2

-MOUNT=	${.CURDIR}/../mount
-DISKLABEL=${.CURDIR}/../disklabel
+MOUNT=	${NETBSDSRCDIR}/sbin/mount
+DISKLABEL=${NETBSDSRCDIR}/sbin/disklabel
 CPPFLAGS+=-DMFS -I${.CURDIR} -I${MOUNT} -I${DISKLABEL}
 DPADD+= ${LIBUTIL}
 LDADD+= -lutil
-.PATH:	${MOUNT} ${DISKLABEL} ${.CURDIR}/../../sys/ufs/ffs 
+.PATH:	${MOUNT} ${DISKLABEL} ${NETBSDSRCDIR}/sys/ufs/ffs 

 LINKS=	${BINDIR}/newfs ${BINDIR}/mount_mfs
 MLINKS=	mount_mfs.8 mfs.8
--- a/sbin/newfs_lfs/Makefile
+++ b/sbin/newfs_lfs/Makefile
@ -1,10 +1,12 @@
-#	$NetBSD: Makefile,v 1.1 1999/03/18 17:18:05 perseant Exp $
+#	$NetBSD: Makefile,v 1.2 2002/08/19 10:17:00 lukem Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93

+.include <bsd.own.mk>
+
 PROG=	newfs_lfs
 SRCS=	dkcksum.c lfs.c lfs_cksum.c misc.c newfs.c
 MAN=	newfs_lfs.8
-.PATH:	${.CURDIR}/../../sys/ufs/lfs ${.CURDIR}/../disklabel
+.PATH:	${NETBSDSRCDIR}/sys/ufs/lfs ${NETBSDSRCDIR}/sbin/disklabel

 DPADD=  ${LIBUTIL}
 LDADD=  -lutil
--- a/sbin/pdisk/Makefile
+++ b/sbin/pdisk/Makefile
@ -1,8 +1,8 @@
-#	$NetBSD: Makefile,v 1.1 2002/07/09 05:57:37 dbj Exp $	
+#	$NetBSD: Makefile,v 1.2 2002/08/19 10:17:00 lukem Exp $	

 .include <bsd.own.mk>

-SRCDIR=	${.CURDIR}/../../dist/pdisk
+SRCDIR=	${NETBSDSRCDIR}/dist/pdisk
 .PATH:	${SRCDIR}

 .if (${MACHINE} == "macppc" || \
--- a/sbin/restore/Makefile
+++ b/sbin/restore/Makefile
@ -1,6 +1,8 @@
-#	$NetBSD: Makefile,v 1.21 2001/02/04 21:38:34 christos Exp $
+#	$NetBSD: Makefile,v 1.22 2002/08/19 10:17:00 lukem Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93

+.include <bsd.own.mk>
+
 PROG=	restore
 LINKS=	${BINDIR}/restore ${BINDIR}/rrestore
 CPPFLAGS+=-DRRESTORE
@ -8,6 +10,6 @@ SRCS=	main.c interactive.c restore.c dirs.c symtab.c tape.c utilities.c \
 	dumprmt.c
 MAN=	restore.8
 MLINKS+=restore.8 rrestore.8
-.PATH:	${.CURDIR}/../dump
+.PATH:	${NETBSDSRCDIR}/sbin/dump

 .include <bsd.prog.mk>
--- a/sbin/rtsol/Makefile
+++ b/sbin/rtsol/Makefile
@ -1,4 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2002/05/31 22:10:18 itojun Exp $
+# $NetBSD: Makefile,v 1.10 2002/08/19 10:17:00 lukem Exp $
+
+NOMAN=	# defined
+
+.include <bsd.own.mk>

 PROG=	rtsol
 SRCS=	rtsold.c rtsol.c if.c probe.c dump.c rtsock.c
@ -6,9 +10,8 @@ SRCS=	rtsold.c rtsol.c if.c probe.c dump.c rtsock.c
 CPPFLAGS+=-DINET6 -DHAVE_GETIFADDRS -DHAVE_ARC4RANDOM -DUSE_RTSOCK

 #MAN=	rtsold.8
-NOMAN=	# defined

-.PATH:	${.CURDIR}/../../usr.sbin/rtsold
+.PATH:	${NETBSDSRCDIR}/usr.sbin/rtsold

 LDADD+=	-lutil
 DPADD+=	${LIBUTIL}
--- a/sbin/setkey/Makefile
+++ b/sbin/setkey/Makefile
@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2000/10/29 12:32:06 itojun Exp $
+# $NetBSD: Makefile,v 1.3 2002/08/19 10:17:00 lukem Exp $
+
+.include <bsd.own.mk>

 PROG=	setkey
 SRCS=	setkey.c parse.y token.l

 #CFLAGS+=-g
-CPPFLAGS+=-I${.CURDIR}/../../lib/libipsec
 LDADD+=	-ll -ly
 DPADD+=	${LIBL} ${LIBY}
 CLEANFILES+=	y.tab.c y.tab.h key_test.o keytest
@ -22,9 +23,9 @@ CLEANFILES+=	scriptdump

 # libpfkey.
 # ipsec_strerror.c is for avoiding shlib reference to non-exported function.
-.PATH: ${.CURDIR}/../../lib/libipsec ${.CURDIR}/../../sys/netkey
+.PATH: ${NETBSDSRCDIR}/lib/libipsec ${NETBSDSRCDIR}/sys/netkey
 SRCS+= pfkey.c pfkey_dump.c key_debug.c ipsec_strerror.c
-CPPFLAGS+=-I${.CURDIR}/../../lib/libipsec -I${.CURDIR}/../../sys/netkey
+CPPFLAGS+=-I${NETBSDSRCDIR}/lib/libipsec -I${NETBSDSRCDIR}/sys/netkey

 MAN=	setkey.8
 LOCALPREFIX=	/usr/pkg
--- a/sbin/sysctl/Makefile
+++ b/sbin/sysctl/Makefile
@ -1,10 +1,12 @@
-#	$NetBSD: Makefile,v 1.12 2002/03/20 00:23:23 christos Exp $
+#	$NetBSD: Makefile,v 1.13 2002/08/19 10:17:01 lukem Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93

+.include <bsd.own.mk>
+
 PROG=	sysctl
 MAN=	sysctl.8

-CPPFLAGS+=-DINET6 -DIPSEC -I${.CURDIR} -I${.CURDIR}/../../sys
+CPPFLAGS+=-DINET6 -DIPSEC -I${.CURDIR} -I${NETBSDSRCDIR}/sys
 #CPPFLAGS+=-DTCP6

 DPADD=  ${LIBUTIL}
--- a/sbin/tunefs/Makefile
+++ b/sbin/tunefs/Makefile
@ -1,12 +1,14 @@
-#	$NetBSD: Makefile,v 1.11 2001/11/09 09:05:51 lukem Exp $
+#	$NetBSD: Makefile,v 1.12 2002/08/19 10:17:01 lukem Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93

+.include <bsd.own.mk>
+
 PROG=	tunefs
 MAN=	tunefs.8
 SRCS=	tunefs.c ffs_bswap.c
 LDADD+=-lutil

-.PATH:  ${.CURDIR}/../../sys/ufs/ffs
+.PATH:  ${NETBSDSRCDIR}/sys/ufs/ffs

 WARNS?=2

--- a/sbin/umount/Makefile
+++ b/sbin/umount/Makefile
@ -1,11 +1,13 @@
-#	$NetBSD: Makefile,v 1.11 1997/10/10 19:52:30 christos Exp $
+#	$NetBSD: Makefile,v 1.12 2002/08/19 10:17:01 lukem Exp $
 #	@(#)Makefile	8.4 (Berkeley) 6/22/95

+.include <bsd.own.mk>
+
 PROG=	umount
 SRCS=	umount.c vfslist.c
 MAN=	umount.8

-MOUNT=	${.CURDIR}/../mount
+MOUNT=	${NETBSDSRCDIR}/sbin/mount
 CPPFLAGS+= -I${MOUNT}
 .PATH:	${MOUNT}