Index: usr.bin/xlint/Makefile.inc
===================================================================
--- usr.bin/xlint/Makefile.inc
+++ usr.bin/xlint/Makefile.inc
@@ -3,13 +3,15 @@
 
 WARNS?=		0
 
-.PATH:		${.CURDIR}/../common
+XLINT_SRC=	${SRCTOP}/usr.bin/xlint
 
-.if exists(${.CURDIR}/../arch/${MACHINE_ARCH})
-CFLAGS+=	-I${.CURDIR}/../arch/${MACHINE_ARCH}
+.PATH:		${XLINT_SRC}/common
+
+.if exists(${XLINT_SRC}/arch/${MACHINE_ARCH})
+CFLAGS+=	-I${XLINT_SRC}/arch/${MACHINE_ARCH}
 .else
-CFLAGS+=	-I${.CURDIR}/../arch/${MACHINE_CPUARCH}
+CFLAGS+=	-I${XLINT_SRC}/arch/${MACHINE_CPUARCH}
 .endif
-CFLAGS+=	-I${.CURDIR}/../common
+CFLAGS+=	-I${XLINT_SRC}/common
 
 OBJECT_FMT=	ELF
Index: usr.bin/xlint/lint1/Makefile
===================================================================
--- usr.bin/xlint/lint1/Makefile
+++ usr.bin/xlint/lint1/Makefile
@@ -13,7 +13,7 @@
 
 BINDIR=	${LIBEXECDIR}
 
-.PATH: ${.CURDIR}/../common
+.PATH: ${XLINT_SRC}/common
 
 lint.7: makeman
 	sh ${.CURDIR}/makeman ${DESTDIR}${BINDIR}/${PROG} -m >${.TARGET}
Index: usr.bin/xlint/lint2/Makefile
===================================================================
--- usr.bin/xlint/lint2/Makefile
+++ usr.bin/xlint/lint2/Makefile
@@ -1,12 +1,12 @@
 #	$NetBSD: Makefile,v 1.2 1995/07/03 21:24:39 cgd Exp $
 # $FreeBSD$
 
-.PATH:	${.CURDIR}/../lint1
+.PATH:	${XLINT_SRC}/lint1
 
 PROG=	lint2
 SRCS=	main2.c hash.c read.c mem.c mem2.c chk.c msg.c emit.c emit2.c inittyp.c
 MAN=
-CFLAGS+=-I${.CURDIR}/../lint1
+CFLAGS+=-I${XLINT_SRC}/lint1
 LINTFLAGS=-abehrz
 
 BINDIR=	${LIBEXECDIR}
Index: usr.bin/xlint/xlint/Makefile
===================================================================
--- usr.bin/xlint/xlint/Makefile
+++ usr.bin/xlint/xlint/Makefile
@@ -1,15 +1,15 @@
 #	$NetBSD: Makefile,v 1.2 1995/07/03 21:25:14 cgd Exp $
 # $FreeBSD$
 
-.PATH:	${.CURDIR}/../lint1
+.PATH:	${XLINT_SRC}/lint1
 
 PROG=	xlint
 PROGNAME=	lint
 SRCS=	xlint.c mem.c
 MAN=	lint.1
 
-CFLAGS+=-I${.CURDIR}/../lint1
+CFLAGS+=-I${XLINT_SRC}/lint1
 CFLAGS+= -DPREFIX=\"${TOOLS_PREFIX}\"
 
-.include "${.CURDIR}/../../Makefile.inc"
+.include "../../Makefile.inc"
 .include <bsd.prog.mk>