summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphx <phx@NetBSD.org>2010-12-03 17:57:43 +0000
committerphx <phx@NetBSD.org>2010-12-03 17:57:43 +0000
commit12e38db326fa99dbc398b80db57ad2d96f013ef9 (patch)
tree53e9980a374b06a311508a83dca5d5fffebeb40f
parentb3dca9dae4733742c7455d6d58a60e96d48a8c1c (diff)
Make sure the new ukbd.any.powerbook keymap is just compiled for macppc.
So it can be removed from distrib/sets/lists/base/mi again.
-rw-r--r--distrib/sets/lists/base/mi3
-rw-r--r--share/wscons/keymaps/Makefile9
2 files changed, 7 insertions, 5 deletions
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 37fef75c683..7c2fa04ef30 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.890 2010/12/02 02:58:28 pgoyette Exp $
+# $NetBSD: mi,v 1.891 2010/12/03 17:57:43 phx Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -4105,7 +4105,6 @@
./usr/share/wscons/keymaps/pckbd.pl.iso8859-2 base-util-share share
./usr/share/wscons/keymaps/pckbd.ru.koi8-r base-util-share share
./usr/share/wscons/keymaps/pckbd.sv.svascii base-util-share share
-./usr/share/wscons/keymaps/ukbd.any.powerbook base-util-share share
./usr/share/wscons/keymaps/ukbd.be.azerty base-util-share share
./usr/share/zoneinfo base-sys-share
./usr/share/zoneinfo/Africa base-sys-share
diff --git a/share/wscons/keymaps/Makefile b/share/wscons/keymaps/Makefile
index dffaa9769b0..dbdfdc9d50c 100644
--- a/share/wscons/keymaps/Makefile
+++ b/share/wscons/keymaps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2010/12/01 17:48:04 phx Exp $
+# $NetBSD: Makefile,v 1.17 2010/12/03 17:57:43 phx Exp $
NOOBJ= # defined
@@ -13,8 +13,11 @@ FILES= \
pckbd.pl.iso8859-2 \
pckbd.ru.koi8-r \
pckbd.sv.svascii \
- ukbd.be.azerty \
- ukbd.any.powerbook
+ ukbd.be.azerty
+
+.if ${MACHINE} == "macppc"
+FILES+= ukbd.any.powerbook
+.endif
FILESDIR= /usr/share/wscons/keymaps