diff --git a/gnu/lib/libbfd/Makefile b/gnu/lib/libbfd/Makefile
index cadff6dbf802..0608d4143207 100644
--- a/gnu/lib/libbfd/Makefile
+++ b/gnu/lib/libbfd/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.28 2002/06/19 16:10:48 itojun Exp $
+#	$NetBSD: Makefile,v 1.29 2002/08/19 09:46:39 lukem Exp $
 
 LIB=		bfd
 
@@ -17,8 +17,7 @@ NOPROFILE=	# defined
 SHLIB_MAJOR=	4
 SHLIB_MINOR=	0
 
-TOP=		${.CURDIR}/../..
-DIST=		${TOP}/dist/toolchain
+DIST=		${NETBSDSRCDIR}/gnu/dist/toolchain
 
 GCPPFLAGS=	${G_archdefs} ${G_DEFS} ${G_INCLUDES} ${G_TDEFAULTS}
 CPPFLAGS+=	-I${.CURDIR}/arch/${MACHINE_ARCH} -I. \
@@ -70,7 +69,7 @@ BFD64=
 CPPFLAGS += -DBFD_TARG_64
 .endif
 
-DIST=		${.CURDIR}/../../dist
+DIST=		${NETBSDSRCDIR}/gnu/dist
 
 # generic bfd
 SRCS=		archive.c archures.c bfd.c cache.c coffgen.c corefile.c \
diff --git a/gnu/lib/libg2c/Makefile b/gnu/lib/libg2c/Makefile
index 35325387e8a7..15cf58d5d3f0 100644
--- a/gnu/lib/libg2c/Makefile
+++ b/gnu/lib/libg2c/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.16 2002/02/11 21:36:34 tv Exp $
+#	$NetBSD: Makefile,v 1.17 2002/08/19 09:46:40 lukem Exp $
 
 REQUIRETOOLS=	yes
 NOLINT=		# defined
@@ -15,8 +15,7 @@ LIB=		g2c
 SHLIB_MAJOR=	1
 SHLIB_MINOR=	0
 
-TOP=		${.CURDIR}/../..
-DIST=		${TOP}/dist/toolchain
+DIST=		${NETBSDSRCDIR}/gnu/dist/toolchain
 
 SRCS=		${G_OBJS:.o=.c} ${G_OBJ:.o=.c}
 
@@ -145,8 +144,8 @@ CLEANFILES+=	g2c.h g2ctypes.sed
 # XXX may need a better way to do this; can be overridden with "cp"
 MAKE_SYMLINK?=	ln -sf
 
-DIST=		${.CURDIR}/../../dist
-ARCH=		${.CURDIR}/../../usr.bin/egcs/arch
+DIST=		${NETBSDSRCDIR}/gnu/dist
+ARCH=		${NETBSDSRCDIR}/gnu/usr.bin/egcs/arch
 
 .if exists(${ARCH}/${MACHINE_ARCH})
 ARCHSUBDIR= ${MACHINE_ARCH}
diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile
index b6a8ac60753a..36130223ff15 100644
--- a/gnu/lib/libgcc/Makefile
+++ b/gnu/lib/libgcc/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.41 2002/03/28 09:58:09 jmc Exp $
+#	$NetBSD: Makefile,v 1.42 2002/08/19 09:46:40 lukem Exp $
 
 REQUIRETOOLS=	yes
 
@@ -14,9 +14,8 @@ NOLINT=		# defined
 .if exists(${.CURDIR}/${MACHINE_ARCH}.mk)
 .include "${.CURDIR}/${MACHINE_ARCH}.mk"
 
-TOP=		${.CURDIR}/../..
-DIST=		${TOP}/dist/toolchain
-GCCARCH=	${TOP}/usr.bin/gcc/arch/${MACHINE_ARCH}
+DIST=		${NETBSDSRCDIR}/gnu/dist/toolchain
+GCCARCH=	${NETBSDSRCDIR}/gnu/usr.bin/gcc/arch/${MACHINE_ARCH}
 
 GCPPFLAGS=	${G_LIBGCC2_CFLAGS} ${G_MAYBE_USE_COLLECT2} ${G_INCLUDES}
 CPPFLAGS+=	-I${GCCARCH} ${GCPPFLAGS:M-D*} ${GCPPFLAGS:M-I*:N-I.*} \
@@ -81,8 +80,8 @@ HAVE_GCC28!=	${CXX} --version | egrep "^(2\.8|egcs)" ; echo
 MKPIC:=		no
 MKPROFILE:=	no
 
-DIST=		${.CURDIR}/../../dist/gcc
-ARCH=		${.CURDIR}/../../usr.bin/egcs/arch
+DIST=		${NETBSDSRCDIR}/gnu/dist/gcc
+ARCH=		${NETBSDSRCDIR}/gnu/usr.bin/egcs/arch
 
 .if exists(${ARCH}/${MACHINE_ARCH})
 ARCHSUBDIR= ${MACHINE_ARCH}
diff --git a/gnu/lib/libiberty/Makefile b/gnu/lib/libiberty/Makefile
index b0e2e1beb512..7a9a71f1e8a8 100644
--- a/gnu/lib/libiberty/Makefile
+++ b/gnu/lib/libiberty/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2002/02/27 17:03:49 tv Exp $
+#	$NetBSD: Makefile,v 1.6 2002/08/19 09:46:41 lukem Exp $
 
 NOLINT=		# defined
 NOPROFILE=	# defined
@@ -13,8 +13,7 @@ LIB=		iberty
 
 .include "${.CURDIR}/defs.mk"
 
-TOP=		${.CURDIR}/../..
-DIST=		${TOP}/dist/toolchain
+DIST=		${NETBSDSRCDIR}/gnu/dist/toolchain
 
 SRCS=		${G_REQUIRED_OFILES:.o=.c} ${G_EXTRA_OFILES:.o=.c} \
 		${G_LIBOBJS:.o=.c} ${G_ALLOCA:.o=.c}
diff --git a/gnu/lib/libobjc/Makefile b/gnu/lib/libobjc/Makefile
index 6051e277d97e..9f07e56fc37b 100644
--- a/gnu/lib/libobjc/Makefile
+++ b/gnu/lib/libobjc/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.19 2002/02/27 17:58:52 tv Exp $
+#	$NetBSD: Makefile,v 1.20 2002/08/19 09:46:41 lukem Exp $
 
 REQUIRETOOLS=	yes
 NOLINT=		# defined
@@ -15,9 +15,8 @@ SHLIB_MINOR=	0
 # Machine-independent definitions (include file names).
 .include "${.CURDIR}/defs.mk"
 
-TOP=		${.CURDIR}/../..
-DIST=		${TOP}/dist/toolchain
-GCCARCH=	${TOP}/usr.bin/gcc/arch/${MACHINE_ARCH}
+DIST=		${NETBSDSRCDIR}/gnu/dist/toolchain
+GCCARCH=	${NETBSDSRCDIR}/gnu/usr.bin/gcc/arch/${MACHINE_ARCH}
 
 SRCS=		${G_OBJS:N[A-Z]*:Nlinking.o:.o=.c} ${G_OBJS:M[A-Z]*:.o=.m} linking.m
 
@@ -59,8 +58,8 @@ DPSRCS+=	runtime-info.h
 INCS=		hash.h objc-list.h sarray.h objc.h objc-api.h NXConstStr.h \
 		Object.h Protocol.h encoding.h typedstream.h thr.h
 INCSDIR=	/usr/include/objc
-DIST=		${.CURDIR}/../../dist/gcc
-ARCH=		${.CURDIR}/../../usr.bin/egcs/arch
+DIST=		${NETBSDSRCDIR}/gnu/dist/gcc
+ARCH=		${NETBSDSRCDIR}/gnu/usr.bin/egcs/arch
 
 .if exists(${ARCH}/${MACHINE_ARCH})
 ARCHSUBDIR= ${MACHINE_ARCH}
diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile
index 472c37ae1430..cb26b4d9d503 100644
--- a/gnu/lib/libstdc++/Makefile
+++ b/gnu/lib/libstdc++/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.18 2002/02/28 02:13:34 tv Exp $
+#	$NetBSD: Makefile,v 1.19 2002/08/19 09:46:41 lukem Exp $
 
 REQUIRETOOLS=	yes
 NOLINT=		# defined
@@ -17,8 +17,7 @@ SHLIB_MINOR=	0
 
 SUBDIR=		include io config
 
-TOP=		${.CURDIR}/../..
-DIST=		${TOP}/dist/toolchain
+DIST=		${NETBSDSRCDIR}/gnu/dist/toolchain
 
 SRCS=		${G_OBJS:.o=.cc} ${G_LIBIBERTY_OBJS:.o=.c}
 INCS=		_G_config.h
@@ -37,7 +36,7 @@ GCPPFLAGS=	${G_XCFLAGS} ${G_CINCLUDES} ${G_MT_CFLAGS} ${G_CXXINCLUDES}
 CPPFLAGS+=	-nostdinc++ -I${.CURDIR}/arch/${MACHINE_ARCH} \
 		${GCPPFLAGS:M-D*} ${GCPPFLAGS:M-I*:N-I.*} \
 		-I${DIST}/gcc/cp/inc \
-		-I${.CURDIR}/../libiberty -I${DIST}/include
+		-I${NETBSDSRCDIR}/gnu/lib/libiberty -I${DIST}/include
 
 CXXFLAGS+=	${G_XCXXFLAGS:M-f*}
 
@@ -115,7 +114,7 @@ SRCS=	PlotFile.cc SFile.cc builtinbuf.cc editbuf.cc filebuf.cc fstream.cc \
 	outfloat.c peekc.c strops.c \
 	cmathi.cc cstdlibi.cc cstringi.cc stdexcepti.cc stlinst.cc
 
-DIST=		${.CURDIR}/../../dist
+DIST=		${NETBSDSRCDIR}/gnu/dist
 CPPFLAGS+=	-I${DESTDIR}/usr/include/g++ -I${DIST}/libstdc++
 
 TEXINFO=	iostream.texi
diff --git a/gnu/lib/libstdc++/config/Makefile b/gnu/lib/libstdc++/config/Makefile
index 6fcfcb67970b..80c463678cf0 100644
--- a/gnu/lib/libstdc++/config/Makefile
+++ b/gnu/lib/libstdc++/config/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.9 2001/12/30 17:21:19 mrg Exp $
+#	$NetBSD: Makefile,v 1.10 2002/08/19 09:46:42 lukem Exp $
 
 # Makefile for _G_config.h, a machine-dependent automatically generated
 # configuration file.
@@ -17,7 +17,7 @@ INCSDIR=	/usr/include/${MACHINE}
 
 DPSRCS=		_G_config.h
 CLEANFILES=	dummy.c dummy.h dummy.C _G_config.h
-DIST=		${.CURDIR}/../../../dist
+DIST=		${NETBSDSRCDIR}/gnu/dist
 
 .ifdef DESTDIR
 LDPRE=	-nostdlib -L${DESTDIR}${SHLIBDIR} -L${DESTDIR}/usr/lib \
diff --git a/gnu/lib/libstdc++/include/Makefile b/gnu/lib/libstdc++/include/Makefile
index 623951adb252..618def55f4d3 100644
--- a/gnu/lib/libstdc++/include/Makefile
+++ b/gnu/lib/libstdc++/include/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2001/07/24 19:44:50 tv Exp $
+#	$NetBSD: Makefile,v 1.2 2002/08/19 09:46:42 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -10,8 +10,7 @@
 
 .include "${.CURDIR}/../arch/${MACHINE_ARCH}/defs.mk"
 
-TOP=		${.CURDIR}/../../..
-DIST=		${TOP}/dist/toolchain
+DIST=		${NETBSDSRCDIR}/gnu/dist/toolchain
 
 INCS=		${G_HEADERS} ${STD_HEADERS} ${STL_HEADERS}
 INCSDIR=	/usr/include/g++
diff --git a/gnu/lib/libstdc++/io/Makefile b/gnu/lib/libstdc++/io/Makefile
index 120c676652a0..c2e819663f0d 100644
--- a/gnu/lib/libstdc++/io/Makefile
+++ b/gnu/lib/libstdc++/io/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2001/12/19 20:52:11 tv Exp $
+#	$NetBSD: Makefile,v 1.8 2002/08/19 09:46:42 lukem Exp $
 
 NOOBJ=	# defined
 
@@ -12,8 +12,7 @@ NOOBJ=	# defined
 
 .include "${.CURDIR}/../arch/${MACHINE_ARCH}/defs.mk"
 
-TOP=		${.CURDIR}/../../..
-DIST=		${TOP}/dist/toolchain
+DIST=		${NETBSDSRCDIR}/gnu/dist/toolchain
 
 INCS=		${LIBIO_HEADERS:Niostdio.h}
 INCSDIR=	/usr/include/g++
@@ -31,7 +30,7 @@ INCS=	PlotFile.h SFile.h builtinbuf.h editbuf.h floatio.h fstream.h \
 	procbuf.h stdiostream.h stream.h streambuf.h strfile.h strstream.h
 INCSDIR=/usr/include/g++
 
-.PATH: ${.CURDIR}/../../../dist/libio
+.PATH: ${NETBSDSRCDIR}/gnu/dist/libio
 
 .include <bsd.prog.mk>
 
diff --git a/gnu/lib/libstdc++/std/Makefile b/gnu/lib/libstdc++/std/Makefile
index bbdf4e3f4d6e..04c874e924b0 100644
--- a/gnu/lib/libstdc++/std/Makefile
+++ b/gnu/lib/libstdc++/std/Makefile
@@ -1,12 +1,14 @@
-#	$NetBSD: Makefile,v 1.5 2001/12/12 01:48:59 tv Exp $
+#	$NetBSD: Makefile,v 1.6 2002/08/19 09:46:42 lukem Exp $
+
+NOOBJ=	# defined
+
+.include <bsd.own.mk>
 
 INCS=	bastring.cc bastring.h complext.cc complext.h dcomplex.h fcomplex.h \
 	ldcomplex.h straits.h
 INCS+=	bastring_inst.h complext_inst.h
 INCSDIR=/usr/include/g++/std
 
-NOOBJ=	# defined
-
-.PATH: ${.CURDIR}/../../../dist/libstdc++/std
+.PATH: ${NETBSDSRCDIR}/gnu/dist/libstdc++/std
 
 .include <bsd.prog.mk>
diff --git a/gnu/lib/libstdc++/stl/Makefile b/gnu/lib/libstdc++/stl/Makefile
index 59a6fa5bfd4b..b05b05aecfdd 100644
--- a/gnu/lib/libstdc++/stl/Makefile
+++ b/gnu/lib/libstdc++/stl/Makefile
@@ -1,4 +1,8 @@
-#	$NetBSD: Makefile,v 1.6 2001/12/12 01:48:59 tv Exp $
+#	$NetBSD: Makefile,v 1.7 2002/08/19 09:46:43 lukem Exp $
+
+NOOBJ=	# defined
+
+.include <bsd.own.mk>
 
 INCS=	algorithm deque functional hash_map hash_set iterator list map \
 	memory numeric pthread_alloc queue rope set slist stack utility \
@@ -16,9 +20,7 @@ INCS=	algorithm deque functional hash_map hash_set iterator list map \
 	tempbuf.h tree.h type_traits.h vector.h
 INCSDIR=/usr/include/g++
 
-NOOBJ=	# defined
-
-.PATH: ${.CURDIR}/../../../dist/libstdc++/stl
+.PATH: ${NETBSDSRCDIR}/gnu/dist/libstdc++/stl
 
 .SUFFIXES: