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.

8 files changed, 43 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index 07810ad..7275f00 100644
--- a/Makefile
+++ b/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.
diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist
index 8d5d2a2..9f2d6b1 100644
--- a/etc/mtree/BSD.root.dist
+++ b/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
 ..
diff --git a/lkm/Makefile b/lkm/Makefile
new file mode 100644
index 0000000..1262bdf
--- /dev/null
+++ b/lkm/Makefile
@@ -0,0 +1,5 @@
+#	$Id$
+
+SUBDIR=	ip_mroute_mod
+
+.include <bsd.subdir.mk>
diff --git a/lkm/Makefile.inc b/lkm/Makefile.inc
new file mode 100644
index 0000000..752e6b0
--- /dev/null
+++ b/lkm/Makefile.inc
@@ -0,0 +1,4 @@
+#	$Id$
+
+BINDIR=	/lkm
+
diff --git a/lkm/ip_mroute_mod/Makefile b/lkm/ip_mroute_mod/Makefile
new file mode 100644
index 0000000..d1f93c3
--- /dev/null
+++ b/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>
diff --git a/sbin/Makefile b/sbin/Makefile
index dc7a9b7..cd2eadf 100644
--- a/sbin/Makefile
+++ b/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>
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
new file mode 100644
index 0000000..1262bdf
--- /dev/null
+++ b/sys/modules/Makefile
@@ -0,0 +1,5 @@
+#	$Id$
+
+SUBDIR=	ip_mroute_mod
+
+.include <bsd.subdir.mk>
diff --git a/sys/modules/ip_mroute_mod/Makefile b/sys/modules/ip_mroute_mod/Makefile
new file mode 100644
index 0000000..d1f93c3
--- /dev/null
+++ b/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>