From 33abdc3f0d6ec209d78fdcb6b6552cea4e3d92d8 Mon Sep 17 00:00:00 2001
From: imp <imp@FreeBSD.org>
Date: Fri, 1 Apr 2005 01:45:03 +0000
Subject: Since there are now more than a couple exceptions to the i386 rule,
 group them better.

---
 usr.sbin/Makefile | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

(limited to 'usr.sbin/Makefile')

diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 2562a3d..e8b528b 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -269,19 +269,9 @@ _kgmon=		kgmon
 .endif
 
 .if ${MACHINE_ARCH} == "i386"
-.if ${MACHINE} == "i386" && !defined(NO_ACPI)
-_acpi=		acpi
-.endif
 _apm=		apm
 _apmd=		apmd
 _asf=		asf
-.if ${MACHINE} == "i386"
-_arlcontrol=	arlcontrol
-_boot0cfg=	boot0cfg
-.endif
-.if ${MACHINE} == "pc98"
-_boot98cfg=	boot98cfg
-.endif
 _btxld=		btxld
 .if !defined(NO_I4B)
 _i4b=		i4b
@@ -294,19 +284,24 @@ _mount_smbfs=	mount_smbfs
 _mptable=	mptable
 _ndiscvt=	ndiscvt
 _pccard=	pccard
-.if ${MACHINE} == "i386"
-_pcvt=		pcvt
-.endif
 _pnpinfo=	pnpinfo
 .if !defined(NO_LIBPTHREAD)
 _pppctl=	pppctl
 .endif
 _sicontrol=	sicontrol
 _spkrtest=	spkrtest
-.if ${MACHINE} == "i386"
+_zzz=		zzz
+.if ${MACHINE} == "i386" 
+.if !defined(NO_ACPI)
+_acpi=		acpi
+.endif
+_arlcontrol=	arlcontrol
+_boot0cfg=	boot0cfg
+_pcvt=		pcvt
 _wlconfig=	wlconfig
+.elif ${MACHINE} == "pc98"
+_boot98cfg=	boot98cfg
 .endif
-_zzz=		zzz
 .endif
 
 .if ${MACHINE_ARCH} == "alpha"
-- 
cgit v1.1