diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index 4370a61a3dce..02257193a8da 100644
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.README,v 1.138 2003/09/13 19:08:26 lukem Exp $
+#	$NetBSD: bsd.README,v 1.139 2003/09/20 06:20:41 lukem Exp $
 #	@(#)bsd.README	8.2 (Berkeley) 4/2/94
 
 This is the README file for the new make "include" files for the BSD
@@ -460,7 +460,7 @@ FILESDIR.<fn>	The location to install the specific file <fn>.
 
 FILESNAME.<fn>	Optional name to install <fn> as.
 
-LNFILES		List of two word items:
+BUILDSYMLINKS	List of two word items:
 			lnsrc lntgt
 		For each lnsrc item, create a symlink named lntgt.
 		The lntgt symlinks are removed by the cleandir target.
diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk
index cea3621b1a4a..d4b2b5ead77c 100644
--- a/share/mk/bsd.files.mk
+++ b/share/mk/bsd.files.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.files.mk,v 1.23 2003/09/03 07:09:39 lukem Exp $
+#	$NetBSD: bsd.files.mk,v 1.24 2003/09/20 06:20:41 lukem Exp $
 
 .if !defined(_BSD_FILES_MK_)
 _BSD_FILES_MK_=1
@@ -55,24 +55,24 @@ filesinstall::	${_F}
 
 
 #
-# LNFILES
+# BUILDSYMLINKS
 #
-.if defined(LNFILES)						# {
+.if defined(BUILDSYMLINKS)					# {
 
-.for _SL _TL in ${LNFILES}
-LNFILES.s+=	${_SL}
-LNFILES.t+=	${_TL}
+.for _SL _TL in ${BUILDSYMLINKS}
+BUILDSYMLINKS.s+=	${_SL}
+BUILDSYMLINKS.t+=	${_TL}
 ${_TL}: ${_SL}
 	rm -f ${.TARGET}
 	ln -s ${.ALLSRC} ${.TARGET}
 .endfor
 
-realall: ${LNFILES.t}
+realall: ${BUILDSYMLINKS.t}
 
-.PHONY:   cleanlnfiles
-cleandir: cleanlnfiles
-cleanlnfiles:
-	rm -f ${LNFILES.t}
+.PHONY:   cleanbuildsymlinks
+cleandir: cleanbuildsymlinks
+cleanbuildsymlinks:
+	rm -f ${BUILDSYMLINKS.t}
 
 .endif								# }
 
diff --git a/sys/lkm/dev/vnd/Makefile b/sys/lkm/dev/vnd/Makefile
index 4666da6a5533..af410b2092f1 100644
--- a/sys/lkm/dev/vnd/Makefile
+++ b/sys/lkm/dev/vnd/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2003/09/04 07:18:01 lukem Exp $
+#	$NetBSD: Makefile,v 1.3 2003/09/20 06:20:42 lukem Exp $
 
 .include "../Makefile.inc"
 
@@ -8,6 +8,6 @@ KMOD=	vnd
 
 SRCS=   lkminit_vnd.c real-vnd.c
 
-LNFILES+=${S}/dev/vnd.c real-vnd.c
+BUILDSYMLINKS+=${S}/dev/vnd.c real-vnd.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/lkm/exec/ultrix_ecoff/Makefile b/sys/lkm/exec/ultrix_ecoff/Makefile
index b3409f733dd5..b8033fc9946d 100644
--- a/sys/lkm/exec/ultrix_ecoff/Makefile
+++ b/sys/lkm/exec/ultrix_ecoff/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2003/09/04 07:18:02 lukem Exp $
+#	$NetBSD: Makefile,v 1.8 2003/09/20 06:20:43 lukem Exp $
 
 .include "../Makefile.inc"
 
@@ -11,6 +11,6 @@ KMOD=	exec_ultrix_ecoff
 SRCS=	lkminit_exec.c
 SRCS+=	ultrix_exec_ecoff.c
 
-LNFILES+=${S}/arch/mips/include mips
+BUILDSYMLINKS+=${S}/arch/mips/include mips
 
 .include <bsd.kmod.mk>
diff --git a/usr.sbin/sup/lib/Makefile b/usr.sbin/sup/lib/Makefile
index ed7ccc21ec42..b0fc6df7eda5 100644
--- a/usr.sbin/sup/lib/Makefile
+++ b/usr.sbin/sup/lib/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2003/09/04 06:42:50 lukem Exp $
+#	$NetBSD: Makefile,v 1.8 2003/09/20 06:20:43 lukem Exp $
 
 NOLINT=	# defined
 NOPIC=	# defined
@@ -13,7 +13,7 @@ SRCS+=	atoo.c errmsg.c expand.c ffilecopy.c filecopy.c \
 
 .PATH: ${.CURDIR}/../source
 
-LNFILES=	${.CURDIR}/../source/netcryptvoid.c netcrypt.c
+BUILDSYMLINKS=	${.CURDIR}/../source/netcryptvoid.c netcrypt.c
 
 # only needed during build
 libinstall::
diff --git a/x11/Xserver/cfb/Makefile.cfb b/x11/Xserver/cfb/Makefile.cfb
index ec2a49f3cc22..28d47863b3fb 100644
--- a/x11/Xserver/cfb/Makefile.cfb
+++ b/x11/Xserver/cfb/Makefile.cfb
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.cfb,v 1.2 2003/09/19 18:32:41 lukem Exp $
+#	$NetBSD: Makefile.cfb,v 1.3 2003/09/20 06:20:44 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -27,7 +27,7 @@ SRCS=		cfb8lineCO.c cfb8lineCP.c cfb8lineG.c cfb8lineX.c \
 		cfbzerarcC.c cfbzerarcG.c cfbzerarcX.c \
 		cfbmodule.c
 
-LNFILES=	cfbline.c cfbseg.c \
+BUILDSYMLINKS=	cfbline.c cfbseg.c \
 		cfbfillarc.c cfbfillarcC.c \
 		cfbfillarc.c cfbfillarcG.c \
 		cfbzerarc.c cfbzerarcC.c \
@@ -57,7 +57,7 @@ LNFILES=	cfbline.c cfbseg.c \
 
 .if ${PIXELSIZE} == 8							# {
 SRCS+=		cfb8bit.c cfbteblt8.c cfbglrop8.c cfbpush8.c cfbrctstp8.c
-LNFILES+=	cfbglblt8.c cfbglrop8.c
+BUILDSYMLINKS+=	cfbglblt8.c cfbglrop8.c
 .endif									# }
 
 XSERVERINCDIR!=	cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR}
diff --git a/x11/Xserver/include/Makefile b/x11/Xserver/include/Makefile
index 83c05abf3185..35d3fda75af5 100644
--- a/x11/Xserver/include/Makefile
+++ b/x11/Xserver/include/Makefile
@@ -1,16 +1,16 @@
-#	$NetBSD: Makefile,v 1.2 2003/09/19 18:36:46 lukem Exp $
+#	$NetBSD: Makefile,v 1.3 2003/09/20 06:20:44 lukem Exp $
 
 .include <bsd.own.mk>
 
 XF86SRC=${X11SRCDIR.xc}/programs/Xserver/hw/xfree86
 
-LNFILES=${XF86SRC}/common/xf86Module.h		xf86Module.h \
-	${XF86SRC}/common/xf86Opt.h		xf86Opt.h \
-	${XF86SRC}/os-support/xf86_libc.h	xf86_libc.h \
-	${XF86SRC}/os-support/xf86_ansic.h	xf86_ansic.h \
-	${XF86SRC}/os-support/bus/xf86Pci.h	xf86Pci.h \
-	${XF86SRC}/xf86Version.h		xf86Version.h \
-	${XF86SRC}/common/compiler.h		compiler.h
+BUILDSYMLINKS=	${XF86SRC}/common/xf86Module.h		xf86Module.h \
+		${XF86SRC}/common/xf86Opt.h		xf86Opt.h \
+		${XF86SRC}/os-support/xf86_libc.h	xf86_libc.h \
+		${XF86SRC}/os-support/xf86_ansic.h	xf86_ansic.h \
+		${XF86SRC}/os-support/bus/xf86Pci.h	xf86Pci.h \
+		${XF86SRC}/xf86Version.h		xf86Version.h \
+		${XF86SRC}/common/compiler.h		compiler.h
 
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff --git a/x11/Xserver/mfb/Makefile b/x11/Xserver/mfb/Makefile
index c21a80e2e989..e566cacf2f05 100644
--- a/x11/Xserver/mfb/Makefile
+++ b/x11/Xserver/mfb/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2003/09/11 18:37:05 lukem Exp $
+#	$NetBSD: Makefile,v 1.2 2003/09/20 06:20:44 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -18,7 +18,7 @@ SRCS=		maskbits.c mfbbitblt.c mfbbltC.c mfbbltCI.c mfbbltG.c \
 		mfbtewhite.c mfbtileC.c mfbtileG.c mfbwindow.c \
 		mfbzerarc.c
 
-LNFILES=	mfbline.c mfbseg.c \
+BUILDSYMLINKS=	mfbline.c mfbseg.c \
 		mfbplygblt.c mfbpgbwht.c \
 		mfbplygblt.c mfbpgbblak.c \
 		mfbplygblt.c mfbpgbinv.c \
diff --git a/x11/Xserver/xkb/Makefile b/x11/Xserver/xkb/Makefile
index 3ce4924c3f7e..f03ac1c4fba8 100644
--- a/x11/Xserver/xkb/Makefile
+++ b/x11/Xserver/xkb/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2003/09/11 18:37:06 lukem Exp $
+#	$NetBSD: Makefile,v 1.2 2003/09/20 06:20:45 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -15,7 +15,7 @@ SRCS=		XKBAlloc.c XKBGAlloc.c XKBMAlloc.c XKBMisc.c ddxBeep.c \
 		xkbPrOtherEv.c xkbSwap.c xkbUtils.c xkbconfig.c xkberrs.c \
 		xkbfmisc.c xkbout.c xkbtext.c xkmread.c
 
-LNFILES+=	xkbmisc.c xkbfmisc.c
+BUILDSYMLINKS+=	xkbmisc.c xkbfmisc.c
 
 XSERVERINCDIR!=	cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR}
 
@@ -36,7 +36,7 @@ CPPFLAGS.xkbInit.c=	-DXKB_BASE_DIRECTORY=\"${X11LIBDIR}/xkb\" \
 .for _S _T in	ddxKillSrv.c xf86KillSrv.c \
 		ddxVT.c xf86VT.c \
 		ddxPrivate.c xf86Private.c
-LNFILES+=		${_S} ${_T}
+BUILDSYMLINKS+=		${_S} ${_T}
 BUILDOBJS+=		${_T:R}.o
 CPPFLAGS.${_T}=		-DXF86DDXACTIONS
 .endfor
diff --git a/x11/bin/beforelight/Makefile b/x11/bin/beforelight/Makefile
index 05ffb4346331..d5923de6122d 100644
--- a/x11/bin/beforelight/Makefile
+++ b/x11/bin/beforelight/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2003/09/13 20:18:01 lukem Exp $
+#	$NetBSD: Makefile,v 1.3 2003/09/20 06:20:45 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -7,7 +7,8 @@ SRCS=	b4light
 
 APPDEFS=Beforelight.ad
 
-LNFILES=b4light.man beforelight.man B4light.ad Beforelight.ad
+BUILDSYMLINKS=	b4light.man beforelight.man \
+		B4light.ad Beforelight.ad
 
 LDADD+=	-lXss -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11
 DPADD+=	${LIBXSS} ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
diff --git a/x11/bin/bitmap/Makefile b/x11/bin/bitmap/Makefile
index 479e0295d59c..deb0436a8cd8 100644
--- a/x11/bin/bitmap/Makefile
+++ b/x11/bin/bitmap/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2003/09/14 06:36:59 lukem Exp $
+#	$NetBSD: Makefile,v 1.4 2003/09/20 06:20:46 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -13,7 +13,7 @@ FILESDIR=${X11INCDIR}/X11/bitmaps
 
 APPDEFS=Bitmap.ad Bitmap-color.ad
 
-LNFILES=Bitmap-co.ad Bitmap-color.ad
+BUILDSYMLINKS=	Bitmap-co.ad Bitmap-color.ad
 
 LDADD+=	-lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -lm
 DPADD+=	${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
diff --git a/x11/bin/ccmakedep/Makefile b/x11/bin/ccmakedep/Makefile
index 48f6425c4b7b..d3b456a79650 100644
--- a/x11/bin/ccmakedep/Makefile
+++ b/x11/bin/ccmakedep/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2003/09/15 08:31:02 lukem Exp $
+#	$NetBSD: Makefile,v 1.2 2003/09/20 06:20:46 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -7,7 +7,7 @@ CPPSCRIPTFLAGS=	-DPREPROC='"gcc -E -traditional"'
 SCRIPTS=	${CPPSCRIPTS}
 MAN=		ccmakedep.1
 
-LNFILES=	mdepend.cpp ccmakedep.cpp
+BUILDSYMLINKS=	mdepend.cpp ccmakedep.cpp
 
 .PATH:	${X11SRCDIR.xc}/config/util
 
diff --git a/x11/bin/editres/Makefile b/x11/bin/editres/Makefile
index b3c829ddd3c1..e3d220549335 100644
--- a/x11/bin/editres/Makefile
+++ b/x11/bin/editres/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2003/09/13 20:18:03 lukem Exp $
+#	$NetBSD: Makefile,v 1.3 2003/09/20 06:20:46 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -8,7 +8,7 @@ SRCS=	actions.c comm.c editres.c geometry.c handler.c setvalues.c \
 
 APPDEFS=Editres.ad Editres-color.ad
 
-LNFILES=Edit-col.ad Editres-color.ad
+BUILDSYMLINKS=	Edit-col.ad Editres-color.ad
 
 LDADD+=	-lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11
 DPADD+=	${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
diff --git a/x11/bin/gccmakedep/Makefile b/x11/bin/gccmakedep/Makefile
index 13fa774ce196..f4a7647cc283 100644
--- a/x11/bin/gccmakedep/Makefile
+++ b/x11/bin/gccmakedep/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2003/09/15 08:31:03 lukem Exp $
+#	$NetBSD: Makefile,v 1.2 2003/09/20 06:20:47 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -8,7 +8,7 @@ CPPSCRIPTFLAGS=	-DCCCMD='"gcc"' -DRMCMD='"rm -f"' -DLNCMD='"ln -s"' \
 SCRIPTS=	${CPPSCRIPTS}
 MAN=		gccmakedep.1
 
-LNFILES=	gccmdep.cpp gccmakedep.cpp
+BUILDSYMLINKS=	gccmdep.cpp gccmakedep.cpp
 
 .PATH:	${X11SRCDIR.xc}/config/util
 
diff --git a/x11/bin/makedepend/Makefile b/x11/bin/makedepend/Makefile
index 9e3930256f43..66ad5ca53cbe 100644
--- a/x11/bin/makedepend/Makefile
+++ b/x11/bin/makedepend/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2003/09/15 08:31:03 lukem Exp $
+#	$NetBSD: Makefile,v 1.2 2003/09/20 06:20:47 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -10,7 +10,7 @@ CPPFLAGS+=	-I${X11SRCDIR.xc}/config/imake \
 
 CPPFLAGS.main.c=-DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".o\"
 
-LNFILES=	mkdepend.man makedepend.man
+BUILDSYMLINKS=	mkdepend.man makedepend.man
 
 .PATH:	${X11SRCDIR.xc}/config/${PROG}
 
diff --git a/x11/bin/oclock/Makefile b/x11/bin/oclock/Makefile
index f4aea6d58af9..d2875b7eb812 100644
--- a/x11/bin/oclock/Makefile
+++ b/x11/bin/oclock/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2003/09/13 20:18:08 lukem Exp $
+#	$NetBSD: Makefile,v 1.3 2003/09/20 06:20:47 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -7,7 +7,7 @@ SRCS=	oclock.c Clock.c transform.c
 
 APPDEFS=Clock-color.ad
 
-LNFILES=Clock-col.ad Clock-color.ad
+BUILDSYMLINKS=	Clock-col.ad Clock-color.ad
 
 LDADD+=	-lXmu -lXt -lSM -lICE -lXext -lX11 -lm
 DPADD+=	${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} ${LIBM}
diff --git a/x11/bin/rstart/Makefile b/x11/bin/rstart/Makefile
index ee6550f6f94e..4124a40c0702 100644
--- a/x11/bin/rstart/Makefile
+++ b/x11/bin/rstart/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2003/09/13 20:18:09 lukem Exp $
+#	$NetBSD: Makefile,v 1.3 2003/09/20 06:20:48 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -11,7 +11,7 @@ CPPFLAGS.server.c=	-DSERVERNAME=\"rstartd\" \
 
 MAN=			rstart.1 rstartd.1
 
-LNFILES=		client.cpp rstart.cpp \
+BUILDSYMLINKS=		client.cpp rstart.cpp \
 			server.cpp rstartd.cpp
 
 CPPSCRIPTS=		config rstart rstartd
diff --git a/x11/bin/ssh-askpass/Makefile b/x11/bin/ssh-askpass/Makefile
index 9b0ab541a06f..46778e91c7e6 100644
--- a/x11/bin/ssh-askpass/Makefile
+++ b/x11/bin/ssh-askpass/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2003/09/14 06:42:24 lukem Exp $
+#	$NetBSD: Makefile,v 1.2 2003/09/20 06:20:48 lukem Exp $
 
 NOMAN=		yes
 
@@ -9,7 +9,7 @@ SRCS=		drawing.c dynlist.c resources.c x11-ssh-askpass.c
 
 APPDEFS=	SshAskpass.ad
 
-LNFILES=	SshAskpass-default.ad SshAskpass.ad
+BUILDSYMLINKS=	SshAskpass-default.ad SshAskpass.ad
 
 FILESDIR=	${X11ROOTDIR}/share/examples/ssh-askpass
 FILES=		SshAskpass-1337.ad SshAskpass-NeXTish.ad \
diff --git a/x11/bin/x11perf/Makefile b/x11/bin/x11perf/Makefile
index 7b09e6bbbafc..c3d7aec729b8 100644
--- a/x11/bin/x11perf/Makefile
+++ b/x11/bin/x11perf/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2003/09/13 21:50:50 lukem Exp $
+#	$NetBSD: Makefile,v 1.4 2003/09/20 06:20:49 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -11,8 +11,8 @@ CPPFLAGS+=	-DMITSHM -DXFT -DXRENDER -I${DESTDIR}/${X11INCDIR}/freetype2
 
 MAN=	Xmark.1 x11perf.1 x11perfcomp.1
 
-LNFILES=x11pcomp.man x11perfcomp.man \
-	x11pcomp.cpp x11perfcomp.cpp \
+BUILDSYMLINKS=	x11pcomp.man x11perfcomp.man \
+		x11pcomp.cpp x11perfcomp.cpp \
 
 CPPSCRIPTS=		x11perfcomp
 CPPSCRIPTFLAGS=		-DLIBPATH=${X11LIBDIR}/x11perfcomp
diff --git a/x11/bin/xcalc/Makefile b/x11/bin/xcalc/Makefile
index 2539163f9d52..c9ca3c5147ce 100644
--- a/x11/bin/xcalc/Makefile
+++ b/x11/bin/xcalc/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2003/09/13 20:18:13 lukem Exp $
+#	$NetBSD: Makefile,v 1.3 2003/09/20 06:20:49 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -7,7 +7,7 @@ SRCS=	actions.c math.c xcalc.c
 
 APPDEFS=XCalc.ad XCalc-color.ad
 
-LNFILES=XCalc-col.ad XCalc-color.ad
+BUILDSYMLINKS=	XCalc-col.ad XCalc-color.ad
 
 LDADD+=	-lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -lm
 DPADD+=	${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
diff --git a/x11/bin/xditview/Makefile b/x11/bin/xditview/Makefile
index 9fbd84b932c4..d826fff68ff0 100644
--- a/x11/bin/xditview/Makefile
+++ b/x11/bin/xditview/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2003/09/13 20:18:15 lukem Exp $
+#	$NetBSD: Makefile,v 1.3 2003/09/20 06:20:49 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -10,7 +10,7 @@ CPPFLAGS+=-DHAS_MKSTEMP -DUSE_XFT -I${DESTDIR}/${X11INCDIR}/freetype2
 
 APPDEFS=Xditview.ad Xditview-chrtr.ad
 
-LNFILES=Xdit-chrtr.ad Xditview-chrtr.ad
+BUILDSYMLINKS=	Xdit-chrtr.ad Xditview-chrtr.ad
 
 LDADD+=	-lXft -lfontconfig -lfreetype -lexpat -lXrender
 DPADD+=	${LIBXFT} ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT} ${LIBXRENDER}
diff --git a/x11/bin/xdm/config/Makefile b/x11/bin/xdm/config/Makefile
index eb070b97e53b..2cfe2484dfce 100644
--- a/x11/bin/xdm/config/Makefile
+++ b/x11/bin/xdm/config/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2003/09/13 20:18:16 lukem Exp $
+#	$NetBSD: Makefile,v 1.3 2003/09/20 06:20:50 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -20,7 +20,7 @@ FILESDIR_XFree86bw.xpm=	${X11LIBDIR}/xdm/pixmaps
 
 SYMLINKS=	Xservers.ws ${X11LIBDIR}/xdm/Xservers
 
-LNFILES=	Xres.cpp Xresources.cpp \
+BUILDSYMLINKS=	Xres.cpp Xresources.cpp \
 		Xserv.ws.cpp Xservers.ws.cpp \
 		xdm-conf.cpp xdm-config.cpp
 
diff --git a/x11/bin/xfs/Makefile b/x11/bin/xfs/Makefile
index 78e2c43c2e21..0d42d4a4db49 100644
--- a/x11/bin/xfs/Makefile
+++ b/x11/bin/xfs/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2003/09/13 20:18:20 lukem Exp $
+#	$NetBSD: Makefile,v 1.3 2003/09/20 06:20:50 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -34,7 +34,7 @@ CPPFLAGS.osglue.c=	${CONN_DEFINES} -DDDXOSINIT \
 CPPFLAGS.config.c=	${CONN_DEFINES} -DFONTCACHE
 
 
-LNFILES=	config.cpp fsconfig.cpp
+BUILDSYMLINKS=	config.cpp fsconfig.cpp
 CPPSCRIPTS=	fsconfig
 CPPSCRIPTFLAGS=	-DDEFAULTFONTPATH=${X11FONTDIR}/misc/,${X11FONTDIR}/Speedo/,${X11FONTDIR}/Type1/,${X11FONTDIR}/CID/,${X11FONTDIR}/75dpi/,${X11FONTDIR}/100dpi/ \
 		-DFSERRORS=/var/log/xfs.log
diff --git a/x11/bin/xlogo/Makefile b/x11/bin/xlogo/Makefile
index 5f08196a9418..5925910d1fb1 100644
--- a/x11/bin/xlogo/Makefile
+++ b/x11/bin/xlogo/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2003/09/13 20:18:31 lukem Exp $
+#	$NetBSD: Makefile,v 1.3 2003/09/20 06:20:51 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -9,7 +9,7 @@ CPPFLAGS+=-DXRENDER -I${DESTDIR}/${X11INCDIR}/freetype2
 
 APPDEFS=XLogo.ad XLogo-color.ad
 
-LNFILES=XLogo-co.ad XLogo-color.ad
+BUILDSYMLINKS=	XLogo-co.ad XLogo-color.ad
 
 LDADD+=	-lXft -lfontconfig -lfreetype -lexpat -lXrender
 DPADD+=	${LIBXFT} ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT} ${LIBXRENDER}
diff --git a/x11/bin/xlsclients/Makefile b/x11/bin/xlsclients/Makefile
index d42bb3573e00..4f552f8df40b 100644
--- a/x11/bin/xlsclients/Makefile
+++ b/x11/bin/xlsclients/Makefile
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.3 2003/09/13 21:50:53 lukem Exp $
+#	$NetBSD: Makefile,v 1.4 2003/09/20 06:20:51 lukem Exp $
 
 .include <bsd.own.mk>
 
 PROG=	xlsclients
 
-LNFILES=xlscli.man xlsclients.man
+BUILDSYMLINKS=	xlscli.man xlsclients.man
 
 LDADD+=	-lXmuu -lXt -lSM -lICE -lXext -lX11
 DPADD+=	${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
diff --git a/x11/bin/xsetpointer/Makefile b/x11/bin/xsetpointer/Makefile
index 1069f95895d8..e805c7ff8894 100644
--- a/x11/bin/xsetpointer/Makefile
+++ b/x11/bin/xsetpointer/Makefile
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.2 2003/09/13 20:18:35 lukem Exp $
+#	$NetBSD: Makefile,v 1.3 2003/09/20 06:20:51 lukem Exp $
 
 .include <bsd.own.mk>
 
 PROG=	xsetpointer
 
-LNFILES=xsetpnt.man xsetpointer.man
+BUILDSYMLINKS=	xsetpnt.man xsetpointer.man
 
 LDADD+=	-lXi -lXext -lX11
 DPADD+=	${LIBXI} ${LIBXEXT} ${LIBX11}
diff --git a/x11/bin/xterm/Makefile b/x11/bin/xterm/Makefile
index 92ff6150af31..730247b4eec7 100644
--- a/x11/bin/xterm/Makefile
+++ b/x11/bin/xterm/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2003/09/13 20:18:37 lukem Exp $
+#	$NetBSD: Makefile,v 1.3 2003/09/20 06:20:52 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -20,9 +20,9 @@ CPPFLAGS.main.c=-DUTMP -DUSE_TTY_GROUP ${X11FLAGS.VERSION}
 
 APPDEFS=XTerm.ad XTerm-color.ad
 
-LNFILES=XTerm-col.ad XTerm-color.ad \
-	termcap xterm.termcap \
-	terminfo xterm.terminfo
+BUILDSYMLINKS=	XTerm-col.ad XTerm-color.ad \
+		termcap xterm.termcap \
+		terminfo xterm.terminfo
 
 FILESDIR=${X11LIBDIR}/etc
 FILES=	xterm.termcap xterm.terminfo
diff --git a/x11/lib/X11/Makefile.libx11 b/x11/lib/X11/Makefile.libx11
index 695c115befa4..d348698c49c8 100644
--- a/x11/lib/X11/Makefile.libx11
+++ b/x11/lib/X11/Makefile.libx11
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.libx11,v 1.1 2003/09/14 07:56:17 lukem Exp $
+#	$NetBSD: Makefile.libx11,v 1.2 2003/09/20 06:20:52 lukem Exp $
 
 LIB=	X11
 .PATH:	${X11SRCDIR.xc}/lib/${LIB}
@@ -121,7 +121,7 @@ CPPFLAGS.KeyBind.c=	$(XKB_DEFINES)
 CPPFLAGS.XKBBind.c=	$(XKB_DEFINES)
 CPPFLAGS.imConv.c=	$(XKB_DEFINES)
 
-LNFILES=	transport.c x11trans.c \
+BUILDSYMLINKS=	transport.c x11trans.c \
 		transport.c ximtrans.c
 
 .include "${NETBSDSRCDIR}/x11/tools/makekeys/Makefile.makekeys"
diff --git a/x11/lib/font/Makefile b/x11/lib/font/Makefile
index 6bb2e1db8bff..6f99d6a8d7f9 100644
--- a/x11/lib/font/Makefile
+++ b/x11/lib/font/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2003/09/13 20:18:53 lukem Exp $
+#	$NetBSD: Makefile,v 1.3 2003/09/20 06:20:53 lukem Exp $
 
 XTODO=	SUBDIR=*/module
 
@@ -75,7 +75,7 @@ CPPFLAGS.${fn}=	-I${X11SRCDIR.xc}/include/fonts \
 		-I${X11SRCDIR.xc}/programs/Xserver/include \
 		-DBUILDCID -DHAVE_CFM -DUSE_MMAP
 .endfor
-LNFILES+=	${X11SRCDIR.xc}/lib/font/Type1/type1.c Type1-type1.c
+BUILDSYMLINKS+=	${X11SRCDIR.xc}/lib/font/Type1/type1.c Type1-type1.c
 CPPFLAGS.Type1-type1.c+=	-I${X11SRCDIR.xc}/lib/font/Type1
 
 SRCS.FreeType=	autohint.c cff.c ftbase.c ftenc.c ftfuncs.c ftglyph.c \
@@ -106,7 +106,7 @@ CPPFLAGS.${fn}=	-I${X11SRCDIR.xc}/lib/font/FreeType \
 		-DXF86VIDMODE -DXvMCExtension  -DSMART_SCHEDULE -DBUILDDEBUG \
 		-DXResExtension
 .endfor
-LNFILES+=	${X11SRCDIR.xc}/extras/freetype2/src/type1/type1.c FreeType-type1.c
+BUILDSYMLINKS+=	${X11SRCDIR.xc}/extras/freetype2/src/type1/type1.c FreeType-type1.c
 CPPFLAGS.FreeType-type1.c+=	-I${X11SRCDIR.xc}/extras/freetype2/src/type1
 
 SRCS.util=	atom.c fontaccel.c fontnames.c fontutil.c fontxlfd.c \
diff --git a/x11/share/cf/Makefile b/x11/share/cf/Makefile
index 049f160620ab..9626449e57e3 100644
--- a/x11/share/cf/Makefile
+++ b/x11/share/cf/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2003/09/11 18:42:22 lukem Exp $
+#	$NetBSD: Makefile,v 1.2 2003/09/20 06:20:53 lukem Exp $
 
 XTODO=	acts as #define InstallEmptyHostDef
 
@@ -30,7 +30,8 @@ FILES=	Amoeba.cf DGUX.cf FreeBSD.cf Imake.cf Imake.rules Imake.tmpl \
 
 FILES+=	host.def
 
-LNFILES=${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf86Version.h version.def \
+BUILDSYMLINKS=\
+	${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf86Version.h version.def \
         ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf86Date.h	date.def
 
 .include <bsd.prog.mk>
diff --git a/x11/share/fonts/util/Makefile b/x11/share/fonts/util/Makefile
index 8d76e657999b..42055c36bb40 100644
--- a/x11/share/fonts/util/Makefile
+++ b/x11/share/fonts/util/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2003/09/13 20:19:03 lukem Exp $
+#	$NetBSD: Makefile,v 1.3 2003/09/20 06:20:53 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -9,23 +9,23 @@ INCS=	map-ISO8859-1 map-ISO8859-2 map-ISO8859-3 map-ISO8859-4 \
 	map-ISO8859-14 map-ISO8859-15 map-ISO8859-16 map-JISX0201.1976-0 \
 	map-KOI8-R
 
-LNFILES=8859-1.TXT map-ISO8859-1 \
-	8859-2.TXT map-ISO8859-2 \
-	8859-3.TXT map-ISO8859-3 \
-	8859-4.TXT map-ISO8859-4 \
-	8859-5.TXT map-ISO8859-5 \
-	8859-6.TXT map-ISO8859-6 \
-	8859-7.TXT map-ISO8859-7 \
-	8859-8.TXT map-ISO8859-8 \
-	8859-9.TXT map-ISO8859-9 \
-	8859-10.TXT map-ISO8859-10 \
-	8859-11.TXT map-ISO8859-11 \
-	8859-13.TXT map-ISO8859-13 \
-	8859-14.TXT map-ISO8859-14 \
-	8859-15.TXT map-ISO8859-15 \
-	8859-16.TXT map-ISO8859-16 \
-	JIS0201.TXT map-JISX0201.1976-0 \
-	KOI8-R.TXT map-KOI8-R
+BUILDSYMLINKS=	8859-1.TXT	map-ISO8859-1 \
+		8859-2.TXT	map-ISO8859-2 \
+		8859-3.TXT	map-ISO8859-3 \
+		8859-4.TXT	map-ISO8859-4 \
+		8859-5.TXT	map-ISO8859-5 \
+		8859-6.TXT	map-ISO8859-6 \
+		8859-7.TXT	map-ISO8859-7 \
+		8859-8.TXT	map-ISO8859-8 \
+		8859-9.TXT	map-ISO8859-9 \
+		8859-10.TXT	map-ISO8859-10 \
+		8859-11.TXT	map-ISO8859-11 \
+		8859-13.TXT	map-ISO8859-13 \
+		8859-14.TXT	map-ISO8859-14 \
+		8859-15.TXT	map-ISO8859-15 \
+		8859-16.TXT	map-ISO8859-16 \
+		JIS0201.TXT	map-JISX0201.1976-0 \
+		KOI8-R.TXT	map-KOI8-R
 
 .PATH:  ${X11SRCDIR.xc}/fonts/util
 
diff --git a/x11/share/man/GL/gl/Makefile b/x11/share/man/GL/gl/Makefile
index 20ba6b1d34e4..80c692f520a1 100644
--- a/x11/share/man/GL/gl/Makefile
+++ b/x11/share/man/GL/gl/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2003/09/13 20:19:03 lukem Exp $
+#	$NetBSD: Makefile,v 1.3 2003/09/20 06:20:54 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -325,7 +325,8 @@ MLINKS=	glBegin.3 glEnd.3 \
 	glVertex.3 glVertex4iv.3 \
 	glVertex.3 glVertex4sv.3
 
-LNFILES=accum.3gl glAccum.man \
+BUILDSYMLINKS=\
+	accum.3gl glAccum.man \
 	activetextureARB.3gl glActiveTextureARB.man \
 	alphafunc.3gl glAlphaFunc.man \
 	aretexturesresident.3gl glAreTexturesResident.man \
diff --git a/x11/share/man/GL/glx/Makefile b/x11/share/man/GL/glx/Makefile
index 701542b0b29a..a57b50f93594 100644
--- a/x11/share/man/GL/glx/Makefile
+++ b/x11/share/man/GL/glx/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2003/09/13 20:19:03 lukem Exp $
+#	$NetBSD: Makefile,v 1.3 2003/09/20 06:20:54 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -12,7 +12,8 @@ MAN=	glXChooseVisual.3 glXCopyContext.3 glXCreateContext.3 \
 	glXQueryServerString.3 glXQueryVersion.3 glXSwapBuffers.3 \
 	glXUseXFont.3 glXWaitGL.3 glXWaitX.3
 
-LNFILES=xchoosevisual.3gl glXChooseVisual.man \
+BUILDSYMLINKS=\
+	xchoosevisual.3gl glXChooseVisual.man \
 	xcopycontext.3gl glXCopyContext.man \
 	xcreatecontext.3gl glXCreateContext.man \
 	xcreateglxpixmap.3gl glXCreateGLXPixmap.man \
diff --git a/x11/share/man/GLU/Makefile b/x11/share/man/GLU/Makefile
index bcfdc5a6db96..87d04c281f56 100644
--- a/x11/share/man/GLU/Makefile
+++ b/x11/share/man/GLU/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2003/09/13 20:19:04 lukem Exp $
+#	$NetBSD: Makefile,v 1.3 2003/09/20 06:20:54 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -24,7 +24,8 @@ MLINKS=	gluBeginCurve.3 gluEndCurve.3 \
 	gluBeginTrim.3 gluEndTrim.3 \
 	gluTessBeginContour.3 gluTessEndContour.3
 
-LNFILES=begincurve.3gl gluBeginCurve.man \
+BUILDSYMLINKS=\
+	begincurve.3gl gluBeginCurve.man \
 	beginpolygon.3gl gluBeginPolygon.man \
 	beginsurface.3gl gluBeginSurface.man \
 	begintrim.3gl gluBeginTrim.man \
diff --git a/x11/share/man/GLw/Makefile b/x11/share/man/GLw/Makefile
index ac7fc514dae5..160e2288dc00 100644
--- a/x11/share/man/GLw/Makefile
+++ b/x11/share/man/GLw/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2003/09/13 20:19:04 lukem Exp $
+#	$NetBSD: Makefile,v 1.3 2003/09/20 06:20:55 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -7,7 +7,8 @@ MAN=	GLwCreateMDrawingArea.3 GLwDrawingArea.3 \
 
 MLINKS=	GLwDrawingArea.3 GLwMDrawingArea.3
 
-LNFILES=glwcreatemdrawingarea.gl GLwCreateMDrawingArea.man \
+BUILDSYMLINKS=\
+	glwcreatemdrawingarea.gl GLwCreateMDrawingArea.man \
 	glwdrawingarea.gl GLwDrawingArea.man \
 	glwdrawingareamakecurrent.gl GLwDrawingAreaMakeCurrent.man \
 	glwdrawingareaswapbuffers.gl GLwDrawingAreaSwapBuffers.man
diff --git a/x11/share/man/X11/Makefile b/x11/share/man/X11/Makefile
index cac0a1a2dff8..600760d927eb 100644
--- a/x11/share/man/X11/Makefile
+++ b/x11/share/man/X11/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2003/09/13 20:19:04 lukem Exp $
+#	$NetBSD: Makefile,v 1.3 2003/09/20 06:20:55 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -382,7 +382,8 @@ MLINKS+=XrmUniqueQuark.3 XrmStringToQuark.3 \
 	XrmUniqueQuark.3 XrmStringToQuarkList.3 \
 	XrmUniqueQuark.3 XrmStringToBindingQuarkList.3
 
-LNFILES=BlkPScrn.man BlackPixelOfScreen.man Dis3C.man DisplayOfCCC.man \
+BUILDSYMLINKS=\
+	BlkPScrn.man BlackPixelOfScreen.man Dis3C.man DisplayOfCCC.man \
 	ImageOrd.man ImageByteOrder.man IsCKey.man IsCursorKey.man \
 	XACHints.man XAllocClassHint.man XAIcSize.man XAllocIconSize.man \
 	XASCmap.man XAllocStandardColormap.man \
diff --git a/x11/share/man/Xext/Makefile b/x11/share/man/Xext/Makefile
index 5799009e569e..b8a0594a62ff 100644
--- a/x11/share/man/Xext/Makefile
+++ b/x11/share/man/Xext/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2003/09/13 20:19:05 lukem Exp $
+#	$NetBSD: Makefile,v 1.3 2003/09/20 06:20:56 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -29,7 +29,8 @@ MLINKS+=XmbufQueryExtension.3 XmbufGetVersion.3 \
 MLINKS+=XeviQueryVersion.3 XeviGetVisualInfo.3 \
 	XeviQueryVersion.3 XeviQueryExtension.3
 
-LNFILES=XShape.man XShapeQueryExtension.man \
+BUILDSYMLINKS=\
+	XShape.man XShapeQueryExtension.man \
 	Xmbuf.man XmbufQueryExtension.man \
 	Xevi.man XeviQueryVersion.man
 
diff --git a/x11/share/man/Xext/dbe/Makefile b/x11/share/man/Xext/dbe/Makefile
index e832a53d3aac..6859265ae700 100644
--- a/x11/share/man/Xext/dbe/Makefile
+++ b/x11/share/man/Xext/dbe/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2003/09/13 20:19:05 lukem Exp $
+#	$NetBSD: Makefile,v 1.3 2003/09/20 06:20:56 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -7,7 +7,8 @@ MAN=	DBE.3 XdbeAllocateBackBufferName.3 XdbeBeginIdiom.3 \
 	XdbeQueryExtension.3 XdbeSwapBuffers.3 \
 	XdbeGetBackBufferAttributes.3 XdbeGetVisualInfo.3
 
-LNFILES=XdbeAllo.man XdbeAllocateBackBufferName.man \
+BUILDSYMLINKS=\
+	XdbeAllo.man XdbeAllocateBackBufferName.man \
 	XdbeBegi.man XdbeBeginIdiom.man \
 	XdbeEndI.man XdbeEndIdiom.man \
 	XdbeDeal.man XdbeDeallocateBackBufferName.man \
diff --git a/x11/share/man/Xi/Makefile b/x11/share/man/Xi/Makefile
index f7e0f45a7dff..0f5254acb20b 100644
--- a/x11/share/man/Xi/Makefile
+++ b/x11/share/man/Xi/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2003/09/13 20:19:06 lukem Exp $
+#	$NetBSD: Makefile,v 1.3 2003/09/20 06:20:56 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -27,7 +27,8 @@ MLINKS=	XChangeDeviceDontPropagateList.3 XGetDeviceDontPropagateList.3 \
 	XSetDeviceButtonMapping.3 XGetDeviceButtonMapping.3 \
 	XSetDeviceFocus.3 XGetDeviceFocus.3
 
-LNFILES=XAllDvEv.man XAllowDeviceEvents.man \
+BUILDSYMLINKS=\
+	XAllDvEv.man XAllowDeviceEvents.man \
 	XChDCtl.man XGetDeviceControl.man \
 	XChFCtl.man XGetFeedbackControl.man \
 	XChKMap.man XGetDeviceKeyMapping.man \
diff --git a/x11/share/man/Xt/Makefile b/x11/share/man/Xt/Makefile
index 26f98f894cae..bc275479e32d 100644
--- a/x11/share/man/Xt/Makefile
+++ b/x11/share/man/Xt/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2003/09/13 20:19:06 lukem Exp $
+#	$NetBSD: Makefile,v 1.3 2003/09/20 06:20:57 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -202,7 +202,8 @@ MLINKS=	XtAddCallback.3 XtAddCallbacks.3 \
 	XtSetValues.3 XtVaGetSubvalues.3 \
 	XtSetValues.3 XtVaSetSubvalues.3
 
-LNFILES=XtActHook.man XtAppAddActionHook.man \
+BUILDSYMLINKS=\
+	XtActHook.man XtAppAddActionHook.man \
 	XtAddAct.man XtAddActions.man \
 	XtAddCbk.man XtAddCallback.man \
 	XtAddEHand.man XtAddEventHandler.man \
diff --git a/x11/share/man/general/Makefile b/x11/share/man/general/Makefile
index b896833822e2..ca60e6afdd0a 100644
--- a/x11/share/man/general/Makefile
+++ b/x11/share/man/general/Makefile
@@ -1,12 +1,13 @@
-#	$NetBSD: Makefile,v 1.2 2003/09/13 20:19:06 lukem Exp $
+#	$NetBSD: Makefile,v 1.3 2003/09/20 06:20:57 lukem Exp $
 
 .include <bsd.own.mk>
 
 MAN=	X.7 XConsortium.7 XStandards.7 XProjectTeam.7 Xsecurity.7
 MLINKS= XProjectTeam.7 X.Org.7
 
-LNFILES=Consortium.man XConsortium.man Standards.man XStandards.man \
-	security.man Xsecurity.man
+BUILDSYMLINKS=	Consortium.man	XConsortium.man	\
+		Standards.man	XStandards.man	\
+		security.man	Xsecurity.man
 
 .PATH:  ${X11SRCDIR.xc}/doc/man/general
 
diff --git a/x11/tools/pswrap/Makefile b/x11/tools/pswrap/Makefile
index 7a8ed5583978..cc9a3223180b 100644
--- a/x11/tools/pswrap/Makefile
+++ b/x11/tools/pswrap/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2003/09/13 20:19:09 lukem Exp $
+#	$NetBSD: Makefile,v 1.3 2003/09/20 06:20:58 lukem Exp $
 
 NOMAN=		1
 
@@ -19,7 +19,7 @@ pswpriv.h: pswparser.h
 #	Can't use -I${DESTDIR}/${X11INCDIR} since pswrap is needed
 #	to create some header files.
 #
-LNFILES=	${X11SRCDIR.xc}/include X11
+BUILDSYMLINKS=	${X11SRCDIR.xc}/include X11
 DPSRCS+=	X11
 
 .include <bsd.x11.mk>