delete unused variable BINDIR, use new variable MODLOAD/MODUNLOAD

8 files changed, 14 insertions, 21 deletions

diff --git a/lkm/Makefile.inc b/lkm/Makefile.inc
index 752e6b0..68e0216 100644
--- a/lkm/Makefile.inc
+++ b/lkm/Makefile.inc
@@ -1,4 +1,4 @@
-#	$Id$
-
-BINDIR=	/lkm
+#	$Id: Makefile.inc,v 1.1 1994/09/16 20:24:27 wollman Exp $
 
+# already set in bsd.kmod.mk
+# KMODDIR=	/lkm
diff --git a/lkm/atapi/Makefile b/lkm/atapi/Makefile
index d232446..9f8c356 100644
--- a/lkm/atapi/Makefile
+++ b/lkm/atapi/Makefile
@@ -1,10 +1,9 @@
-#	$Id: Makefile,v 1.4 1996/06/23 14:58:08 bde Exp $
+#	$Id: Makefile,v 1.5 1996/09/06 23:32:54 pst Exp $
 
 .PATH:          ${.CURDIR}/../../sys/i386/isa
 KMOD            = atapi_mod
 SRCS            = atapi.c wdc.h opt_atapi.h #wcd.h 
 NOMAN           =
-BINDIR          = /lkm
 CFLAGS         += -nostdinc -I. -DATAPI_MODULE
 CLEANFILES     += $(KMOD) machine wdc.h wcd.h opt_atapi.h *.b
 LN              = ln -f -s
@@ -13,10 +12,10 @@ EXPORT_SYMS	= _atapi_mod _atapi_debug_ptr _atapi_intr_ptr \
 		  _atapi_request_wait_ptr _atapi_start_ptr
 
 load:           ${PROG}
-		/sbin/modload -u -e atapi_mod $(PROG)
+		${MODLOAD} -u -e atapi_mod $(PROG)
 
 unload:         ${PROG}
-		/sbin/modunload -n atapi
+		${MODUNLOAD} -n atapi
 
 wdc.h:
 		echo "#define NWDC 2" > wdc.h
diff --git a/lkm/syscons/blank/Makefile b/lkm/syscons/blank/Makefile
index b94f1cf..b63e280 100644
--- a/lkm/syscons/blank/Makefile
+++ b/lkm/syscons/blank/Makefile
@@ -1,6 +1,5 @@
-#	$Id: Makefile,v 1.1 1995/02/22 13:45:29 sos Exp $
+#	$Id: Makefile,v 1.2 1995/02/23 19:45:19 phk Exp $
 
-BINDIR=	/lkm
 KMOD=	blank_saver_mod
 SRCS= 	blank_saver.c
 
diff --git a/lkm/syscons/fade/Makefile b/lkm/syscons/fade/Makefile
index 998900d..215d8ed 100644
--- a/lkm/syscons/fade/Makefile
+++ b/lkm/syscons/fade/Makefile
@@ -1,6 +1,5 @@
-#	$Id: Makefile,v 1.1 1995/02/22 13:46:32 sos Exp $
+#	$Id: Makefile,v 1.2 1995/02/23 19:45:26 phk Exp $
 
-BINDIR=	/lkm
 KMOD=	fade_saver_mod
 SRCS= 	fade_saver.c
 
diff --git a/lkm/syscons/green/Makefile b/lkm/syscons/green/Makefile
index 0aeccb2..e41ea0e 100644
--- a/lkm/syscons/green/Makefile
+++ b/lkm/syscons/green/Makefile
@@ -1,6 +1,5 @@
-#	$Id: Makefile,v 1.1 1995/02/22 13:47:10 sos Exp $
+#	$Id: Makefile,v 1.2 1995/02/23 19:45:28 phk Exp $
 
-BINDIR=	/lkm
 KMOD=	green_saver_mod
 SRCS= 	green_saver.c
 
diff --git a/lkm/syscons/snake/Makefile b/lkm/syscons/snake/Makefile
index 2d674e3..c3eda52 100644
--- a/lkm/syscons/snake/Makefile
+++ b/lkm/syscons/snake/Makefile
@@ -1,6 +1,5 @@
-#	$Id: Makefile,v 1.1 1995/02/22 13:48:06 sos Exp $
+#	$Id: Makefile,v 1.2 1995/02/23 19:45:29 phk Exp $
 
-BINDIR=	/lkm
 KMOD=	snake_saver_mod
 SRCS= 	snake_saver.c
 
diff --git a/lkm/syscons/star/Makefile b/lkm/syscons/star/Makefile
index b22cfc6..ae1414a 100644
--- a/lkm/syscons/star/Makefile
+++ b/lkm/syscons/star/Makefile
@@ -1,6 +1,5 @@
-#	$Id: Makefile,v 1.1 1995/02/22 13:47:35 sos Exp $
+#	$Id: Makefile,v 1.2 1995/02/23 19:45:30 phk Exp $
 
-BINDIR=	/lkm
 KMOD=	star_saver_mod
 SRCS= 	star_saver.c
 
diff --git a/lkm/wcd/Makefile b/lkm/wcd/Makefile
index ec1a07e..6b0a1c3 100644
--- a/lkm/wcd/Makefile
+++ b/lkm/wcd/Makefile
@@ -1,19 +1,18 @@
-#	$Id: Makefile,v 1.3 1996/06/23 14:58:14 bde Exp $
+#	$Id: Makefile,v 1.4 1996/09/06 23:32:55 pst Exp $
 
 .PATH:          ${.CURDIR}/../../sys/i386/isa
 KMOD            = wcd_mod
 SRCS            = wcd.c wdc.h wcd.h opt_atapi.h
 NOMAN           =
-BINDIR          = /lkm
 CFLAGS         += -nostdinc -I. -DWCD_MODULE
 CLEANFILES     += $(KMOD) machine wdc.h wcd.h opt_atapi.h *.b
 LN              = ln -f -s
 
 load:           ${PROG}
-		/sbin/modload -u -e wcd $(PROG)
+		${MODLOAD} -u -e wcd $(PROG)
 
 unload:         ${PROG}
-		/sbin/modunload -n wcd
+		${MODUNLOAD} -n wcd
 
 wdc.h:
 		echo "#define NWDC 2" > wdc.h