Sync to NetBSD 970110

7 files changed, 24 insertions, 25 deletions

diff --git a/sys/arch/amiga/stand/loadkmap/Makefile b/sys/arch/amiga/stand/loadkmap/Makefile
index a13714f1176..d08e6e75dd2 100644
--- a/sys/arch/amiga/stand/loadkmap/Makefile
+++ b/sys/arch/amiga/stand/loadkmap/Makefile
@@ -1,5 +1,5 @@
-# $OpenBSD: Makefile,v 1.2 1996/10/04 22:35:34 niklas Exp $
-# $NetBSD: Makefile,v 1.1.2.2 1996/07/31 16:08:59 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/01/16 09:27:05 niklas Exp $
+# $NetBSD: Makefile,v 1.5 1996/09/27 03:23:13 chopps Exp $
 
 PROG=loadkmap
 NOMAN=loadkmap
diff --git a/sys/arch/amiga/stand/loadkmap/Makefile.inc b/sys/arch/amiga/stand/loadkmap/Makefile.inc
index 9114e0bf062..9fe957060e2 100644
--- a/sys/arch/amiga/stand/loadkmap/Makefile.inc
+++ b/sys/arch/amiga/stand/loadkmap/Makefile.inc
@@ -1,18 +1,15 @@
-# $OpenBSD: Makefile.inc,v 1.3 1996/10/04 23:31:23 niklas Exp $
-# $NetBSD: Makefile.inc,v 1.1.2.3 1996/06/25 01:13:36 jtc Exp $
+# $OpenBSD: Makefile.inc,v 1.4 1997/01/16 09:27:06 niklas Exp $
+# $NetBSD: Makefile.inc,v 1.2 1996/06/21 21:55:53 is Exp $
 
-BINDIR=	/usr/share/keymaps/amiga
+BINDIR=	${DESTDIR}/usr/share/keymaps/amiga
 NOMAN=
 CC=	${HOSTCC}
 
-all:	${MAP}
-
-${MAP}: ${PROG}
-	./${PROG} >${MAP}
-
-realinstall:
-.if !exists(${DESTDIR}${BINDIR})
-	mkdir -p ${DESTDIR}${BINDIR}
+# XXX making dirs should be handled by mtree
+realinstall: ${PROG}
+.if !exists(${BINDIR})
+	mkdir -p ${BINDIR}
 .endif
-	install ${COPY} -o ${BINOWN} -g ${BINGRP} -m 555 ${MAP} \
-	    ${DESTDIR}${BINDIR}
+	./${PROG} > ${BINDIR}/${MAP}
+	chmod 555 ${BINDIR}/${MAP}
+	chown ${BINOWN}.${BINGRP} ${BINDIR}/${MAP}
diff --git a/sys/arch/amiga/stand/loadkmap/din/din-kbdmap.c b/sys/arch/amiga/stand/loadkmap/din/din-kbdmap.c
index 8872b9251ce..f2346dcb5d1 100644
--- a/sys/arch/amiga/stand/loadkmap/din/din-kbdmap.c
+++ b/sys/arch/amiga/stand/loadkmap/din/din-kbdmap.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: din-kbdmap.c,v 1.2 1996/10/04 22:35:39 niklas Exp $	*/
-/*	$NetBSD: din-kbdmap.c,v 1.4.6.1 1996/06/08 16:03:59 is Exp $	*/
+/*	$OpenBSD: din-kbdmap.c,v 1.3 1997/01/16 09:27:07 niklas Exp $	*/
+/*	$NetBSD: din-kbdmap.c,v 1.5 1996/06/08 15:28:51 is Exp $	*/
 
 #include "../../../dev/kbdmap.h"
 
diff --git a/sys/arch/amiga/stand/loadkmap/sw/Makefile b/sys/arch/amiga/stand/loadkmap/sw/Makefile
index 14aabe63262..2eaa0f2f5f4 100644
--- a/sys/arch/amiga/stand/loadkmap/sw/Makefile
+++ b/sys/arch/amiga/stand/loadkmap/sw/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.2 1996/10/04 22:35:40 niklas Exp $
-# $NetBSD: Makefile,v 1.2.2.1 1996/07/31 16:11:27 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/01/16 09:27:09 niklas Exp $
+# $NetBSD: Makefile,v 1.4 1996/12/31 22:36:19 veego Exp $
 
 PROG=sw-kbdmap
+NOMAN=
 MAP=sw.map
 
 .include <bsd.prog.mk>
diff --git a/sys/arch/amiga/stand/loadkmap/sw/sw-kbdmap.c b/sys/arch/amiga/stand/loadkmap/sw/sw-kbdmap.c
index 8ed46de9840..84da5915830 100644
--- a/sys/arch/amiga/stand/loadkmap/sw/sw-kbdmap.c
+++ b/sys/arch/amiga/stand/loadkmap/sw/sw-kbdmap.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: sw-kbdmap.c,v 1.2 1996/10/04 22:35:40 niklas Exp $	*/
-/*	$NetBSD: sw-kbdmap.c,v 1.2.4.1 1996/06/08 16:04:02 is Exp $	*/
+/*	$OpenBSD: sw-kbdmap.c,v 1.3 1997/01/16 09:27:11 niklas Exp $	*/
+/*	$NetBSD: sw-kbdmap.c,v 1.3 1996/06/08 15:28:58 is Exp $	*/
 
 /*
  * Copyright (c) 1993 Markus Wild
diff --git a/sys/arch/amiga/stand/loadkmap/us/Makefile b/sys/arch/amiga/stand/loadkmap/us/Makefile
index 5c303e5b5e6..df748236577 100644
--- a/sys/arch/amiga/stand/loadkmap/us/Makefile
+++ b/sys/arch/amiga/stand/loadkmap/us/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.2 1996/10/04 22:35:41 niklas Exp $
-# $NetBSD: Makefile,v 1.2 1996/06/08 15:42:03 is Exp $
+# $OpenBSD: Makefile,v 1.3 1997/01/16 09:27:12 niklas Exp $
+# $NetBSD: Makefile,v 1.3 1996/12/31 22:36:20 veego Exp $
 
 PROG=us-kbdmap
+NOMAN=
 MAP=us.map
 
 .include <bsd.prog.mk>
diff --git a/sys/arch/amiga/stand/loadkmap/us/us-kbdmap.c b/sys/arch/amiga/stand/loadkmap/us/us-kbdmap.c
index b2acc38d0a0..26c4febfb22 100644
--- a/sys/arch/amiga/stand/loadkmap/us/us-kbdmap.c
+++ b/sys/arch/amiga/stand/loadkmap/us/us-kbdmap.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: us-kbdmap.c,v 1.2 1996/10/04 22:35:42 niklas Exp $	*/
-/*	$NetBSD: us-kbdmap.c,v 1.3.6.1 1996/06/08 16:04:03 is Exp $	*/
+/*	$OpenBSD: us-kbdmap.c,v 1.3 1997/01/16 09:27:13 niklas Exp $	*/
+/*	$NetBSD: us-kbdmap.c,v 1.4 1996/06/08 15:29:04 is Exp $	*/
 
 #include "../../../dev/kbdmap.h"