Per discussion on the mailing-lists, move LKMs from /sbin to /lkm, and

arrange for that directory to get created by mtree.  Also, process secure
directory after all the others, because the programs there may overlay
ones installed from the main part of the tree.

Makefile

@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile,v 1.16 1994/09/09 20:29:20 csgr Exp $
+#	$Id: Makefile,v 1.17 1994/09/12 05:17:15 rgrimes Exp $
 #
 # Make command line options:
 #	-DCLOBBER will remove /usr/include and MOST of /usr/lib 
@@ -8,6 +8,7 @@
 #	-DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
 #	-DNOCRYPT will prevent building of crypt versions
 # XXX2	-DNOKERBEROS do not build Kerberos
+#	-DNOLKM do not build loadable kernel modules
 #	-DNOOBJDIR do not run ``${MAKE} obj''
 #	-DNOPROFILE do not build profiled libraries
 #	-DNOSECURE do not go into secure subdir
@@ -53,9 +54,6 @@ SUBDIR+= libexec
 .if exists(sbin)
 SUBDIR+= sbin
 .endif
-.if exists(secure) && !defined(NOCRYPT) && !defined(NOSECURE)
-SUBDIR+= secure
-.endif
 .if exists(share)
 SUBDIR+= share
 .endif
@@ -68,6 +66,12 @@ SUBDIR+= usr.bin
 .if exists(usr.sbin)
 SUBDIR+= usr.sbin
 .endif
+.if exists(secure) && !defined(NOCRYPT) && !defined(NOSECURE)
+SUBDIR+= secure
+.endif
+.if exists(lkm) && !defined(NOLKM)
+SUBDIR+= lkm
+.endif
 
 # These are last, since it is nice to at least get the base system
 # rebuilt before you do them.

etc/mtree/BSD.root.dist

@@ -1,4 +1,4 @@
-#	$Id: BSD.root.dist,v 1.15 1994/09/09 13:35:57 rgrimes Exp $
+#	$Id: BSD.root.dist,v 1.16 1994/09/13 22:04:53 wollman Exp $
 #
 
 # top-level files are owned by root.wheel
@@ -51,5 +51,7 @@ var	type=dir
 /set uname=bin gname=bin mode=0755
 bin	type=dir
 ..
+lkm	type=dir
+..
 sbin	type=dir
 ..

lkm/Makefile

@@ -0,0 +1,5 @@
+#	$Id$
+
+SUBDIR=	ip_mroute_mod
+
+.include <bsd.subdir.mk>

lkm/Makefile.inc

@@ -0,0 +1,4 @@
+#	$Id$
+
+BINDIR=	/lkm
+

lkm/ip_mroute_mod/Makefile

@@ -0,0 +1,9 @@
+#	$Id: Makefile,v 1.1 1994/09/14 22:11:51 wollman Exp $
+
+.PATH:	${.CURDIR}/../../sys/netinet
+KMOD=	ip_mroute_mod
+SRCS=	ip_mroute.c
+NOMAN=
+CFLAGS+= -DMROUTE_LKM -DMROUTING
+
+.include <bsd.kmod.mk>

sbin/Makefile

@@ -9,8 +9,4 @@ SUBDIR= adjkerntz badsect clri comcontrol disklabel dmesg dump dumpfs dumplfs \
 	nfsiod nologin ping quotacheck reboot restore route savecore \
 	shutdown slattach startslip swapon tunefs umount
 
-. if !defined(NOLKM)
-SUBDIR+= ip_mroute_mod
-.endif
-
 .include <bsd.subdir.mk>

sys/modules/Makefile

@@ -0,0 +1,5 @@
+#	$Id$
+
+SUBDIR=	ip_mroute_mod
+
+.include <bsd.subdir.mk>

sys/modules/ip_mroute_mod/Makefile

@@ -0,0 +1,9 @@
+#	$Id: Makefile,v 1.1 1994/09/14 22:11:51 wollman Exp $
+
+.PATH:	${.CURDIR}/../../sys/netinet
+KMOD=	ip_mroute_mod
+SRCS=	ip_mroute.c
+NOMAN=
+CFLAGS+= -DMROUTE_LKM -DMROUTING
+
+.include <bsd.kmod.mk>