From 5024543cadc5d5d0878a95b64a3276b491d93869 Mon Sep 17 00:00:00 2001 From: Niklas Hallqvist Date: Fri, 4 Oct 1996 22:35:43 +0000 Subject: OpenBSD tags. Make it work under cross compilation. Clean up build. --- sys/arch/amiga/stand/loadkmap/Makefile | 4 ++-- sys/arch/amiga/stand/loadkmap/Makefile.inc | 20 +++++++++++--------- sys/arch/amiga/stand/loadkmap/din/Makefile | 1 + sys/arch/amiga/stand/loadkmap/din/din-kbdmap.c | 1 + sys/arch/amiga/stand/loadkmap/loadkmap.c | 1 + sys/arch/amiga/stand/loadkmap/sw/Makefile | 1 + sys/arch/amiga/stand/loadkmap/sw/sw-kbdmap.c | 1 + sys/arch/amiga/stand/loadkmap/us/Makefile | 1 + sys/arch/amiga/stand/loadkmap/us/us-kbdmap.c | 1 + 9 files changed, 20 insertions(+), 11 deletions(-) (limited to 'sys/arch') diff --git a/sys/arch/amiga/stand/loadkmap/Makefile b/sys/arch/amiga/stand/loadkmap/Makefile index 8a518d3c8f9..a13714f1176 100644 --- a/sys/arch/amiga/stand/loadkmap/Makefile +++ b/sys/arch/amiga/stand/loadkmap/Makefile @@ -1,5 +1,5 @@ -# $OpenBSD: Makefile,v 1.1 1996/08/23 23:23:18 niklas Exp $ -# $NetBSD: Makefile,v 1.1.2.1 1996/06/08 15:28:35 is Exp $ +# $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 $ PROG=loadkmap NOMAN=loadkmap diff --git a/sys/arch/amiga/stand/loadkmap/Makefile.inc b/sys/arch/amiga/stand/loadkmap/Makefile.inc index 715255fa93d..aff507c0818 100644 --- a/sys/arch/amiga/stand/loadkmap/Makefile.inc +++ b/sys/arch/amiga/stand/loadkmap/Makefile.inc @@ -1,13 +1,15 @@ -# $OpenBSD: Makefile.inc,v 1.1 1996/08/23 23:38:04 niklas Exp $ +# $OpenBSD: Makefile.inc,v 1.2 1996/10/04 22:35:35 niklas Exp $ # $NetBSD: Makefile.inc,v 1.1.2.3 1996/06/25 01:13:36 jtc Exp $ -BINDIR=$(DESTDIR)/usr/share/keymaps/amiga +BINDIR= /usr/share/keymaps/amiga NOMAN= +CC= ${HOSTCC} -realinstall: ${PROG} -.if !.exists(${BINDIR}( - mkdir -p ${BINDIR} -.endif - ./${PROG} > ${BINDIR}/${MAP} - chmod 555 ${BINDIR}/${MAP} - chown ${BINOWN}.${BINGRP} ${BINDIR}/${MAP} +all: ${MAP} + +${MAP}: ${PROG} + ./${PROG} >${MAP} + +realinstall: + install ${COPY} -o ${BINOWN} -g ${BINGRP} -m 555 ${MAP} \ + ${DESTDIR}${BINDIR} diff --git a/sys/arch/amiga/stand/loadkmap/din/Makefile b/sys/arch/amiga/stand/loadkmap/din/Makefile index c69a17627cc..2337b926cec 100644 --- a/sys/arch/amiga/stand/loadkmap/din/Makefile +++ b/sys/arch/amiga/stand/loadkmap/din/Makefile @@ -1,3 +1,4 @@ +# $OpenBSD: Makefile,v 1.2 1996/10/04 22:35:38 niklas Exp $ # $NetBSD: Makefile,v 1.2 1996/06/08 15:42:00 is Exp $ PROG=din-kbdmap diff --git a/sys/arch/amiga/stand/loadkmap/din/din-kbdmap.c b/sys/arch/amiga/stand/loadkmap/din/din-kbdmap.c index 087c2be2780..8872b9251ce 100644 --- a/sys/arch/amiga/stand/loadkmap/din/din-kbdmap.c +++ b/sys/arch/amiga/stand/loadkmap/din/din-kbdmap.c @@ -1,3 +1,4 @@ +/* $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 $ */ #include "../../../dev/kbdmap.h" diff --git a/sys/arch/amiga/stand/loadkmap/loadkmap.c b/sys/arch/amiga/stand/loadkmap/loadkmap.c index 72a6c7b7e3f..ddb7eb102c2 100644 --- a/sys/arch/amiga/stand/loadkmap/loadkmap.c +++ b/sys/arch/amiga/stand/loadkmap/loadkmap.c @@ -1,3 +1,4 @@ +/* $OpenBSD: loadkmap.c,v 1.2 1996/10/04 22:35:36 niklas Exp $ */ /* $NetBSD: loadkmap.c,v 1.4 1994/10/26 02:07:09 cgd Exp $ */ #include diff --git a/sys/arch/amiga/stand/loadkmap/sw/Makefile b/sys/arch/amiga/stand/loadkmap/sw/Makefile index 524206f93d6..14aabe63262 100644 --- a/sys/arch/amiga/stand/loadkmap/sw/Makefile +++ b/sys/arch/amiga/stand/loadkmap/sw/Makefile @@ -1,3 +1,4 @@ +# $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 $ PROG=sw-kbdmap diff --git a/sys/arch/amiga/stand/loadkmap/sw/sw-kbdmap.c b/sys/arch/amiga/stand/loadkmap/sw/sw-kbdmap.c index 1f31b730c60..8ed46de9840 100644 --- a/sys/arch/amiga/stand/loadkmap/sw/sw-kbdmap.c +++ b/sys/arch/amiga/stand/loadkmap/sw/sw-kbdmap.c @@ -1,3 +1,4 @@ +/* $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 $ */ /* diff --git a/sys/arch/amiga/stand/loadkmap/us/Makefile b/sys/arch/amiga/stand/loadkmap/us/Makefile index 3f3ffc216b4..5c303e5b5e6 100644 --- a/sys/arch/amiga/stand/loadkmap/us/Makefile +++ b/sys/arch/amiga/stand/loadkmap/us/Makefile @@ -1,3 +1,4 @@ +# $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 $ PROG=us-kbdmap diff --git a/sys/arch/amiga/stand/loadkmap/us/us-kbdmap.c b/sys/arch/amiga/stand/loadkmap/us/us-kbdmap.c index cfb5f9900a6..b2acc38d0a0 100644 --- a/sys/arch/amiga/stand/loadkmap/us/us-kbdmap.c +++ b/sys/arch/amiga/stand/loadkmap/us/us-kbdmap.c @@ -1,3 +1,4 @@ +/* $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 $ */ #include "../../../dev/kbdmap.h" -- cgit v1.2.3