Index: sys/conf/kmod.mk
===================================================================
RCS file: /home/ncvs/src/sys/conf/kmod.mk,v
retrieving revision 1.82.2.1
diff -u -r1.82.2.1 kmod.mk
--- sys/conf/kmod.mk	2000/07/07 00:29:28	1.82.2.1
+++ sys/conf/kmod.mk	2000/07/07 09:24:54
@@ -132,16 +132,13 @@
 .endif
 
 ${PROG}: ${KMOD}.kld ${KMODDEPS}
-	${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld ${KMODDEPS}
-
-${KMOD}.kld: ${OBJS}
 .if ${OBJFORMAT} == elf
-	gensetdefs ${OBJS}
+	gensetdefs ${KMOD}.kld
 	${CC} ${CFLAGS} -c setdef0.c
 	${CC} ${CFLAGS} -c setdef1.c
-	${LD} ${LDFLAGS} -r -o ${.TARGET} setdef0.o ${OBJS} setdef1.o
+	${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} setdef0.o ${KMOD}.kld setdef1.o ${KMODDEPS}
 .else
-	${LD} ${LDFLAGS} -r -o ${.TARGET} ${OBJS}
+	${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld ${KMODDEPS}
 .endif
 
 .if defined(KMODDEPS)
@@ -153,6 +150,9 @@
 	${CC} -shared ${CFLAGS} -o ${dep} __${dep}_hack_dep.c
 .endfor
 .endif
+
+${KMOD}.kld: ${OBJS}
+	${LD} ${LDFLAGS} -r -o ${.TARGET} ${OBJS}
 
 .if !defined(NOMAN)
 .include <bsd.man.mk>
Index: share/mk/bsd.kmod.mk
===================================================================
RCS file: /home/ncvs/src/share/mk/bsd.kmod.mk,v
retrieving revision 1.75.2.1
diff -u -r1.75.2.1 bsd.kmod.mk
--- share/mk/bsd.kmod.mk	2000/07/07 09:09:41	1.75.2.1
+++ share/mk/bsd.kmod.mk	2000/07/07 09:24:54
@@ -1,7 +1,7 @@
 # $FreeBSD: src/share/mk/bsd.kmod.mk,v 1.75.2.1 2000/07/07 09:09:41 obrien Exp $
 
 # Search for kernel source tree in standard places.
-.for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. /sys /usr/src/sys
+.for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. ${.CURDIR}/../../../.. /sys /usr/src/sys
 .if !defined(SYSDIR) && exists(${_dir}/kern/) && exists(${_dir}/conf/)
 SYSDIR=	${_dir}
 .endif