summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--share/mk/Makefile3
-rw-r--r--share/mk/bsd.README8
-rw-r--r--share/mk/bsd.dep.mk3
-rw-r--r--share/mk/bsd.doc.mk3
-rw-r--r--share/mk/bsd.lib.mk3
-rw-r--r--share/mk/bsd.lkm.mk13
-rw-r--r--share/mk/bsd.man.mk3
-rw-r--r--share/mk/bsd.nls.mk3
-rw-r--r--share/mk/bsd.obj.mk5
-rw-r--r--share/mk/bsd.own.mk3
-rw-r--r--share/mk/bsd.prog.mk1
-rw-r--r--share/mk/bsd.subdir.mk3
-rw-r--r--share/mk/bsd.sys.mk4
-rw-r--r--share/mk/sys.mk3
14 files changed, 41 insertions, 17 deletions
diff --git a/share/mk/Makefile b/share/mk/Makefile
index 2bfa40505d1..f1f6b47fddd 100644
--- a/share/mk/Makefile
+++ b/share/mk/Makefile
@@ -1,4 +1,5 @@
-# $OpenBSD: Makefile,v 1.3 1996/02/25 19:02:30 mickey Exp $
+# $OpenBSD: Makefile,v 1.4 1996/03/05 11:12:30 mickey Exp $
+# $NetBSD: Makefile,v 1.12 1995/10/22 00:45:53 christos Exp $
# @(#)Makefile 5.3 (Berkeley) 6/22/90
FILES= bsd.README bsd.doc.mk bsd.dep.mk bsd.lib.mk bsd.man.mk bsd.nls.mk \
diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index cee81c0b7fd..62a73019ea9 100644
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -1,4 +1,5 @@
-# $OpenBSD: bsd.README,v 1.6 1996/02/25 19:02:31 mickey Exp $
+# $OpenBSD: bsd.README,v 1.7 1996/03/05 11:12:34 mickey Exp $
+# $NetBSD: bsd.README,v 1.15 1996/01/22 22:46:06 cgd Exp $
# @(#)bsd.README 5.1 (Berkeley) 5/11/90
This is the README file for the new make "include" files for the BSD
@@ -397,6 +398,11 @@ LKMOWN Module owner.
LKMMODE Module mode.
+POSTINSTALL Program to pass with '-p' flag to the modload.
+ If not defined,
+ POSTINSTALL=${LKM}install
+ is assumed.
+
The include file <bsd.lkm.mk> includes the file named "../Makefile.inc"
if it exists, as well as the include file <bsd.man.mk>.
diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk
index 8cefadd33fe..af22772e367 100644
--- a/share/mk/bsd.dep.mk
+++ b/share/mk/bsd.dep.mk
@@ -1,4 +1,5 @@
-# $OpenBSD: bsd.dep.mk,v 1.2 1996/02/25 19:02:32 mickey Exp $
+# $OpenBSD: bsd.dep.mk,v 1.3 1996/03/05 11:12:37 mickey Exp $
+# $NetBSD: bsd.dep.mk,v 1.12 1995/09/27 01:15:09 christos Exp $
# some of the rules involve .h sources, so remove them from mkdep line
.if !target(depend)
diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
index 030c3b141b2..cfe69ea7f8d 100644
--- a/share/mk/bsd.doc.mk
+++ b/share/mk/bsd.doc.mk
@@ -1,4 +1,5 @@
-# $OpenBSD: bsd.doc.mk,v 1.2 1996/02/25 19:02:32 mickey Exp $
+# $OpenBSD: bsd.doc.mk,v 1.3 1996/03/05 11:12:39 mickey Exp $
+# $NetBSD: bsd.doc.mk,v 1.20 1994/07/26 19:42:37 mycroft Exp $
# @(#)bsd.doc.mk 8.1 (Berkeley) 8/14/93
BIB?= bib
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index f8347cbf73d..007f4ee97e0 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -1,4 +1,5 @@
-# $OpenBSD: bsd.lib.mk,v 1.4 1996/02/25 19:02:33 mickey Exp $
+# $OpenBSD: bsd.lib.mk,v 1.5 1996/03/05 11:12:41 mickey Exp $
+# $NetBSD: bsd.lib.mk,v 1.67 1996/01/17 20:39:26 mycroft Exp $
# @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91
.if exists(${.CURDIR}/../Makefile.inc)
diff --git a/share/mk/bsd.lkm.mk b/share/mk/bsd.lkm.mk
index 80d6a764317..a4334ec315f 100644
--- a/share/mk/bsd.lkm.mk
+++ b/share/mk/bsd.lkm.mk
@@ -1,5 +1,5 @@
-# $OpenBSD: bsd.lkm.mk,v 1.2 1996/03/02 21:01:23 tholo Exp $
-# @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
+# $OpenBSD: bsd.lkm.mk,v 1.3 1996/03/05 11:12:45 mickey Exp $
+# from @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
.if exists(${.CURDIR}/../Makefile.inc)
.include "${.CURDIR}/../Makefile.inc"
@@ -19,6 +19,9 @@ OBJS+= ${SRCS:N*.h:N*.sh:R:S/$/.o/g}
LOBJS+= ${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.ln}
.endif
COMBINED?=combined.o
+.if !defined(POSTINSTALL)
+POSTINSTALL= ${LKM}install
+.endif
.if defined(OBJS) && !empty(OBJS)
@@ -61,7 +64,11 @@ realinstall:
load: ${COMBINED}
- modload -d -o $(LKM) -e$(LKM) $(COMBINED)
+ if [ -x ${.CURDIR}/${POSTINSTALL} ]; then \
+ modload -d -o $(LKM) -e$(LKM) -p${.CURDIR}/${POSTINSTALL} $(COMBINED); \
+ else \
+ modload -d -o $(LKM) -e$(LKM) $(COMBINED); \
+ fi
unload:
modunload -n $(LKM)
diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
index 5bc9b4f66a3..f5bf01cced7 100644
--- a/share/mk/bsd.man.mk
+++ b/share/mk/bsd.man.mk
@@ -1,4 +1,5 @@
-# $OpenBSD: bsd.man.mk,v 1.7 1996/02/25 19:02:34 mickey Exp $
+# $OpenBSD: bsd.man.mk,v 1.8 1996/03/05 11:12:48 mickey Exp $
+# $NetBSD: bsd.man.mk,v 1.23 1996/02/10 07:49:33 jtc Exp $
# @(#)bsd.man.mk 5.2 (Berkeley) 5/11/90
MANTARGET?= cat
diff --git a/share/mk/bsd.nls.mk b/share/mk/bsd.nls.mk
index a38d40a17a5..c0f1684da0b 100644
--- a/share/mk/bsd.nls.mk
+++ b/share/mk/bsd.nls.mk
@@ -1,4 +1,5 @@
-# $OpenBSD: bsd.nls.mk,v 1.2 1996/02/25 19:02:35 mickey Exp $
+# $OpenBSD: bsd.nls.mk,v 1.3 1996/03/05 11:12:50 mickey Exp $
+# $NetBSD: bsd.nls.mk,v 1.2 1995/04/27 18:05:38 jtc Exp $
.if !target(.MAIN)
.if exists(${.CURDIR}/../Makefile.inc)
diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk
index 2e42f019187..26355619366 100644
--- a/share/mk/bsd.obj.mk
+++ b/share/mk/bsd.obj.mk
@@ -1,4 +1,5 @@
-# $NetBSD: bsd.obj.mk,v 1.7 1995/06/10 20:46:35 mycroft Exp $
+# $OpenBSD: bsd.obj.mk,v 1.2 1996/03/05 11:12:53 mickey Exp $
+# $NetBSD: bsd.obj.mk,v 1.8 1996/02/21 10:02:00 pk Exp $
.if !target(obj)
.if defined(NOOBJ)
@@ -25,7 +26,7 @@ __usrobjdirpf=
obj: _SUBDIRUSE
@cd ${.CURDIR}; rm -f ${__objdir} > /dev/null 2>&1 || true; \
- here=`pwd`; subdir=`echo $$here | sed 's,^${BSDSRCDIR}/,,'`; \
+ here=`pwd`; subdir=$${here#${BSDSRCDIR}/}; \
if test $$here != $$subdir ; then \
dest=${__usrobjdir}/$$subdir${__usrobjdirpf} ; \
echo "$$here/${__objdir} -> $$dest"; \
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 1b060277216..bafb7c106e6 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,5 @@
-# $OpenBSD: bsd.own.mk,v 1.5 1996/03/02 21:01:24 tholo Exp $
+# $OpenBSD: bsd.own.mk,v 1.6 1996/03/05 11:12:56 mickey Exp $
+# $NetBSD: bsd.own.mk,v 1.23 1995/11/03 23:33:33 cgd Exp $
# Defining `SKEY' causes support for S/key authentication to be compiled in.
SKEY= yes
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 25688515074..d998a0429af 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -1,3 +1,4 @@
+# $OpenBSD: bsd.prog.mk,v 1.2 1996/03/05 11:12:59 mickey Exp $
# $NetBSD: bsd.prog.mk,v 1.53 1995/06/25 22:29:02 cgd Exp $
# @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk
index 4810f46de02..f98960e7f06 100644
--- a/share/mk/bsd.subdir.mk
+++ b/share/mk/bsd.subdir.mk
@@ -1,4 +1,5 @@
-# $OpenBSD: bsd.subdir.mk,v 1.4 1996/02/25 19:02:36 mickey Exp $
+# $OpenBSD: bsd.subdir.mk,v 1.5 1996/03/05 11:13:01 mickey Exp $
+# $NetBSD: bsd.subdir.mk,v 1.10 1995/07/24 04:22:29 cgd Exp $
# @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91
.if !target(.MAIN)
diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
index 8404e8d0259..3ee31bd36cd 100644
--- a/share/mk/bsd.sys.mk
+++ b/share/mk/bsd.sys.mk
@@ -1,5 +1,5 @@
-# $OpenBSD: bsd.sys.mk,v 1.4 1996/02/25 19:02:36 mickey Exp $
-#
+# $OpenBSD: bsd.sys.mk,v 1.5 1996/03/05 11:13:04 mickey Exp $
+# $NetBSD: bsd.sys.mk,v 1.2 1995/12/13 01:25:07 cgd Exp $
# Overrides used for NetBSD source tree builds.
#CFLAGS+= -Werror
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index 344cd2aa30f..ec11555db73 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -1,4 +1,5 @@
-# $OpenBSD: sys.mk,v 1.3 1996/02/25 19:02:37 mickey Exp $
+# $OpenBSD: sys.mk,v 1.4 1996/03/05 11:13:06 mickey Exp $
+# $NetBSD: sys.mk,v 1.22 1995/09/24 23:49:09 christos Exp $
# @(#)sys.mk 5.11 (Berkeley) 3/13/91
unix= We run OpenBSD.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 07:21:48 +0000