9 files changed, 33 insertions, 24 deletions
diff --git a/sys/arch/i386/isa/pcvt/Util/cursor/Makefile b/sys/arch/i386/isa/pcvt/Util/cursor/Makefile
index 26170427613..24a2e330d60 100644
--- a/sys/arch/i386/isa/pcvt/Util/cursor/Makefile
+++ b/sys/arch/i386/isa/pcvt/Util/cursor/Makefile
@@ -1,4 +1,7 @@
-#	$OpenBSD: Makefile,v 1.4 2000/05/25 21:54:45 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.5 2000/05/27 05:52:11 deraadt Exp $
+
+MAN1=cursor.1
+MANSUBDIR=/i386
 
 .if ${MACHINE} == "i386"
 PROG=	cursor
@@ -6,7 +9,4 @@ PROG=	cursor
 NOPROG=yes
 .endif
 
-MAN=cursor.1
-MANSUBDIR=/i386
-
 .include <bsd.prog.mk>
diff --git a/sys/arch/i386/isa/pcvt/Util/fed/Makefile b/sys/arch/i386/isa/pcvt/Util/fed/Makefile
index 29956f77a95..334bc3fad16 100644
--- a/sys/arch/i386/isa/pcvt/Util/fed/Makefile
+++ b/sys/arch/i386/isa/pcvt/Util/fed/Makefile
@@ -1,4 +1,7 @@
-#	$OpenBSD: Makefile,v 1.6 2000/05/25 21:54:45 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.7 2000/05/27 05:52:11 deraadt Exp $
+
+MAN1=	fed.1
+MANSUBDIR=/i386
 
 .if ${MACHINE} == "i386"
 PROG=	fed
@@ -7,7 +10,5 @@ LDADD=	-lcurses
 .else
 NOPROG=	yes
 .endif
-MAN=	fed.1
-MANSUBDIR=/i386
 
 .include <bsd.prog.mk>
diff --git a/sys/arch/i386/isa/pcvt/Util/fontedit/Makefile b/sys/arch/i386/isa/pcvt/Util/fontedit/Makefile
index ffdb7873475..e92eabbd604 100644
--- a/sys/arch/i386/isa/pcvt/Util/fontedit/Makefile
+++ b/sys/arch/i386/isa/pcvt/Util/fontedit/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 2000/05/25 21:54:46 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.6 2000/05/27 05:52:11 deraadt Exp $
 
 .if ${MACHINE} == "i386"
 PROG=		fontedit
@@ -6,7 +6,7 @@ CLEANFILES+=	core.fontedit fontedit.core
 .else
 NOPROG=		yes
 .endif
-MAN=	fontedit.1
+MAN1=	fontedit.1
 MANSUBDIR=/i386
 
 .include <bsd.prog.mk>
diff --git a/sys/arch/i386/isa/pcvt/Util/fonts/Makefile b/sys/arch/i386/isa/pcvt/Util/fonts/Makefile
index e342b9a096c..4cecd9cc7ac 100644
--- a/sys/arch/i386/isa/pcvt/Util/fonts/Makefile
+++ b/sys/arch/i386/isa/pcvt/Util/fonts/Makefile
@@ -1,4 +1,6 @@
-#	$OpenBSD: Makefile,v 1.5 1999/09/11 21:41:31 mickey Exp $
+#	$OpenBSD: Makefile,v 1.6 2000/05/27 05:52:11 deraadt Exp $
+
+.if ${MACHINE} == "i386"
 
 FONTS	= 	vt220l.814 vt220h.814 vt220l.808 vt220h.808 \
 		vt220l.816 vt220h.816 vt220l.810 vt220h.810 \
@@ -67,3 +69,8 @@ koi8-8x14: ${.CURDIR}/koi8-8x14.uu
 
 koi8-8x16: ${.CURDIR}/koi8-8x16.uu
 	uudecode ${.CURDIR}/$@.uu
+
+.else
+all install:
+
+.endif
diff --git a/sys/arch/i386/isa/pcvt/Util/kcon/Makefile b/sys/arch/i386/isa/pcvt/Util/kcon/Makefile
index b30319d55bb..07a02f96f4f 100644
--- a/sys/arch/i386/isa/pcvt/Util/kcon/Makefile
+++ b/sys/arch/i386/isa/pcvt/Util/kcon/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 2000/05/25 21:54:50 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.6 2000/05/27 05:52:12 deraadt Exp $
 
 .if ${MACHINE} == "i386"
 PROG=		kcon
@@ -13,7 +13,7 @@ LDADD =       -L${.CURDIR}/../keycap -L${.CURDIR}/../keycap/obj -lkeycap
 NOPROG=yes
 .endif
 
-MAN=	kcon.1
+MAN1=	kcon.1
 MANSUBDIR=/i386
 
 .include <bsd.prog.mk>
diff --git a/sys/arch/i386/isa/pcvt/Util/loadfont/Makefile b/sys/arch/i386/isa/pcvt/Util/loadfont/Makefile
index 060c1bf92da..2c52ff3659d 100644
--- a/sys/arch/i386/isa/pcvt/Util/loadfont/Makefile
+++ b/sys/arch/i386/isa/pcvt/Util/loadfont/Makefile
@@ -1,11 +1,12 @@
-#	$OpenBSD: Makefile,v 1.4 2000/05/25 21:54:51 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.5 2000/05/27 05:52:12 deraadt Exp $
+
+MAN1=	loadfont.1
+MANSUBDIR=/i386
 
 .if ${MACHINE} == "i386"
 PROG=	loadfont
 .else
 NOPROG=	yes
 .endif
-MAN=	loadfont.1
-MANSUBDIR=/i386
 
 .include <bsd.prog.mk>
diff --git a/sys/arch/i386/isa/pcvt/Util/scon/Makefile b/sys/arch/i386/isa/pcvt/Util/scon/Makefile
index 8360db2dbff..0a3a9326ec7 100644
--- a/sys/arch/i386/isa/pcvt/Util/scon/Makefile
+++ b/sys/arch/i386/isa/pcvt/Util/scon/Makefile
@@ -1,12 +1,12 @@
-#	$OpenBSD: Makefile,v 1.4 2000/05/25 21:54:52 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.5 2000/05/27 05:52:12 deraadt Exp $
+
+MAN1=scon.1
+MANSUBDIR=/i386
 
 .if ${MACHINE} == "i386"
 PROG=	scon
 .else
-NOPROG=yes
+NOPROG=
 .endif
 
-MAN=scon.1
-MANSUBDIR=/i386
-
 .include <bsd.prog.mk>
diff --git a/sys/arch/i386/isa/pcvt/Util/userkeys/Makefile b/sys/arch/i386/isa/pcvt/Util/userkeys/Makefile
index 8117e1c6ff9..215bf66006c 100644
--- a/sys/arch/i386/isa/pcvt/Util/userkeys/Makefile
+++ b/sys/arch/i386/isa/pcvt/Util/userkeys/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 2000/05/25 21:54:53 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.5 2000/05/27 05:52:12 deraadt Exp $
 
 .if ${MACHINE} == "i386"
 PROG=		vt220keys
@@ -6,7 +6,7 @@ PROG=		vt220keys
 NOPROG=yes
 .endif
 
-MAN=vt220keys.1
+MAN1=vt220keys.1
 MANSUBDIR=/i386
 
 .include <bsd.prog.mk>
diff --git a/sys/arch/i386/isa/pcvt/Util/vttest/Makefile b/sys/arch/i386/isa/pcvt/Util/vttest/Makefile
index 3597ea06158..12159797116 100644
--- a/sys/arch/i386/isa/pcvt/Util/vttest/Makefile
+++ b/sys/arch/i386/isa/pcvt/Util/vttest/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 2000/05/25 21:54:56 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.5 2000/05/27 05:52:12 deraadt Exp $
 
 .if ${MACHINE} == "i386"
 PROG=		vttest
@@ -8,7 +8,7 @@ SRCS=		main.c esc.c
 NOPROG=yes
 .endif
 
-MAN=		vttest.1
+MAN1=		vttest.1
 MANSUBDIR=	/i386
 
 .include <bsd.prog.mk>