Index: conf/Makefile.i386
===================================================================
RCS file: /home/ncvs/src/sys/conf/Makefile.i386,v
retrieving revision 1.255
diff -u -r1.255 Makefile.i386
--- conf/Makefile.i386	20 Feb 2002 23:35:49 -0000	1.255
+++ conf/Makefile.i386	2 Mar 2002 14:48:10 -0000
@@ -30,7 +30,8 @@
 .endif
 .include "$S/conf/kern.pre.mk"
 
-MKMODULESENV+= MACHINE=i386
+KERNCOMPILEDIR!=pwd
+MKMODULESENV+= MACHINE=i386 KERNCOMPILEDIR=${KERNCOMPILEDIR}
 
 %BEFORE_DEPEND
 
Index: conf/kmod.mk
===================================================================
RCS file: /home/ncvs/src/sys/conf/kmod.mk,v
retrieving revision 1.113
diff -u -r1.113 kmod.mk
--- conf/kmod.mk	1 Mar 2002 01:21:29 -0000	1.113
+++ conf/kmod.mk	13 Mar 2002 14:13:20 -0000
@@ -93,15 +93,20 @@
 
 .SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S
 
-CFLAGS+=	${COPTS} -D_KERNEL ${CWARNFLAGS}
-CFLAGS+=	-DKLD_MODULE
 
 # Don't use any standard or source-relative include directories.
 # Since -nostdinc will annull any previous -I paths, we repeat all
 # such paths after -nostdinc.  It doesn't seem to be possible to
 # add to the front of `make' variable.
 _ICFLAGS:=	${CFLAGS:M-I*}
-CFLAGS+=	-nostdinc -I- ${INCLMAGIC} ${_ICFLAGS}
+#CFLAGS=		${COPTFLAGS} -D_KERNEL ${CWARNFLAGS}
+CFLAGS+=	-D_KERNEL ${CWARNFLAGS}
+CFLAGS+=	-DKLD_MODULE
+CFLAGS+=	-nostdinc -I- ${INCLMAGIC}
+.if defined(KERNCOMPILEDIR)
+CFLAGS+=	-I. -I${KERNCOMPILEDIR} -include ${KERNCOMPILEDIR}/opt_global.h
+.endif
+CFLAGS+=${_ICFLAGS}
 
 # Add -I paths for system headers.  Individual KLD makefiles don't
 # need any -I paths for this.  Similar defaults for .PATH can't be