summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--distrib/Makefile4
-rw-r--r--etc/Makefile4
-rw-r--r--sbin/kbd/Makefile4
-rw-r--r--sbin/pdisk/Makefile4
-rw-r--r--share/man/man4/Makefile4
-rw-r--r--share/man/man8/Makefile4
-rw-r--r--sys/kern/Makefile4
7 files changed, 14 insertions, 14 deletions
diff --git a/distrib/Makefile b/distrib/Makefile
index 9a07eb6e1ac..648e6a6dcbf 100644
--- a/distrib/Makefile
+++ b/distrib/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.39 2011/07/07 19:16:43 deraadt Exp $
+# $OpenBSD: Makefile,v 1.40 2012/06/20 18:33:58 matthew Exp $
SUBDIR= special notes
.if make(obj)
-SUBDIR+=alpha amd64 armish beagle hp300 hppa i386 landisk loongson mac68k macppc \
+SUBDIR+=alpha amd64 armish beagle hp300 hppa i386 landisk loongson macppc \
mvme68k mvme88k sgi socppc sparc sparc64 vax zaurus
.elif exists(${MACHINE})
SUBDIR+=${MACHINE}
diff --git a/etc/Makefile b/etc/Makefile
index 36c0cc83c92..9f75e04d19c 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.318 2012/04/13 10:47:16 espie Exp $
+# $OpenBSD: Makefile,v 1.319 2012/06/20 18:33:58 matthew Exp $
TZDIR= /usr/share/zoneinfo
LOCALTIME= Canada/Mountain
@@ -346,7 +346,7 @@ update-moduli:
SUBDIR+= etc.alpha etc.amd64 etc.armish etc.aviion etc.hp300 etc.hppa
SUBDIR+= etc.hppa64 etc.i386 etc.landisk etc.loongson etc.luna88k
-SUBDIR+= etc.mac68k etc.macppc etc.mvme68k etc.mvme88k etc.palm
+SUBDIR+= etc.macppc etc.mvme68k etc.mvme88k etc.palm
SUBDIR+= etc.sgi etc.socppc etc.sparc etc.sparc64 etc.vax etc.zaurus
.include <bsd.subdir.mk>
diff --git a/sbin/kbd/Makefile b/sbin/kbd/Makefile
index bb5df43b1e3..f4902e5d859 100644
--- a/sbin/kbd/Makefile
+++ b/sbin/kbd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2009/10/11 12:19:49 maja Exp $
+# $OpenBSD: Makefile,v 1.34 2012/06/20 18:33:59 matthew Exp $
#
# Be sure to change src/distrib/special/kbd/Makefile as well if you add or
@@ -18,7 +18,7 @@ NOPROG= Yes
.endif
MAN= kbd.8
-MANSUBDIR= alpha amd64 hp300 hppa i386 landisk luna88k mac68k macppc \
+MANSUBDIR= alpha amd64 hp300 hppa i386 landisk luna88k macppc \
sgi socppc sparc sparc64 vax zaurus
.include <bsd.prog.mk>
diff --git a/sbin/pdisk/Makefile b/sbin/pdisk/Makefile
index 234ce8b739d..1ad5f216668 100644
--- a/sbin/pdisk/Makefile
+++ b/sbin/pdisk/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.9 2010/05/25 19:01:32 deraadt Exp $
+# $Id: Makefile,v 1.10 2012/06/20 18:33:59 matthew Exp $
.if ${MACHINE} == "macppc" || ${MACHINE} == "mac68k"
PROG= pdisk
@@ -15,7 +15,7 @@ NOPROG=yes
.endif
MAN= pdisk.8
-MANSUBDIR=macppc mac68k
+MANSUBDIR=macppc
.include <bsd.prog.mk>
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 579d637ecdc..1e8e4450f74 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.532 2012/04/06 15:42:56 jsing Exp $
+# $OpenBSD: Makefile,v 1.533 2012/06/20 18:33:58 matthew Exp $
MAN= aac.4 ac97.4 acphy.4 \
acpi.4 acpiac.4 acpiasus.4 acpibat.4 acpibtn.4 acpicpu.4 acpidock.4 \
@@ -97,7 +97,7 @@ MLINKS+=vlan.4 svlan.4
# man4.hppa64
SUBDIR= man4.alpha man4.amd64 man4.armish man4.aviion man4.hp300 \
man4.hppa man4.i386 man4.landisk man4.loongson man4.luna88k \
- man4.mac68k man4.macppc man4.mvme68k man4.mvme88k \
+ man4.macppc man4.mvme68k man4.mvme88k \
man4.sgi man4.socppc man4.sparc man4.sparc64 man4.vax man4.zaurus
CLEANFILES+= wi.4
diff --git a/share/man/man8/Makefile b/share/man/man8/Makefile
index 808e0e3848d..416952bb494 100644
--- a/share/man/man8/Makefile
+++ b/share/man/man8/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.80 2011/07/08 20:57:50 tedu Exp $
+# $OpenBSD: Makefile,v 1.81 2012/06/20 18:33:58 matthew Exp $
# $NetBSD: Makefile,v 1.13 1996/03/28 21:36:40 mark Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
@@ -15,7 +15,7 @@ MLINKS+=rc.conf.8 rc.conf.local.8
SUBDIR= man8.alpha man8.amd64 man8.armish man8.aviion man8.hp300 \
man8.hppa man8.hppa64 man8.i386 man8.landisk man8.loongson \
- man8.luna88k man8.mac68k \
+ man8.luna88k \
man8.macppc man8.mvme68k man8.mvme88k man8.palm man8.sgi man8.socppc \
man8.sparc man8.sparc64 man8.vax man8.zaurus
diff --git a/sys/kern/Makefile b/sys/kern/Makefile
index c76fdb8c6f8..5af8609b08c 100644
--- a/sys/kern/Makefile
+++ b/sys/kern/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.33 2011/07/07 22:02:17 tedu Exp $
+# $OpenBSD: Makefile,v 1.34 2012/06/20 18:33:59 matthew Exp $
# Makefile for kernel tags files, init_sysent, etc.
ARCH= alpha amd64 armish aviion beagle hp300 \
hppa hppa64 i386 landisk loongson \
- luna88k mac68k macppc mvme68k \
+ luna88k macppc mvme68k \
mvme88k palm sgi socppc \
solbourne sparc sparc64 vax zaurus