From b8276924360585668de21a2c0e192122ffee35c3 Mon Sep 17 00:00:00 2001
From: Yoshihiro Takahashi <nyan@FreeBSD.org>
Date: Tue, 21 May 2002 09:44:52 +0000
Subject: [PATCH] MFi386: revision 1.22

---
 sys/boot/pc98/libpc98/Makefile | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/sys/boot/pc98/libpc98/Makefile b/sys/boot/pc98/libpc98/Makefile
index cec2491333d3..a09d0b7cdb3a 100644
--- a/sys/boot/pc98/libpc98/Makefile
+++ b/sys/boot/pc98/libpc98/Makefile
@@ -11,21 +11,12 @@ SRCS=	aout_freebsd.c biosacpi.c bioscd.c biosdisk.c biosmem.c biospnp.c \
 	time.c vidconsole.c
 
 CFLAGS+=	-ffreestanding
-CFLAGS+=	-I${.CURDIR}/../../common -I${.CURDIR}/../btx/lib \
-		-I${.CURDIR}/../../i386/libi386 \
-		-I${.CURDIR}/../../../contrib/dev/acpica \
-		-I${.CURDIR}/../../.. -I.
-CFLAGS+=	-DPC98
-
 BOOT_COMCONSOLE_PORT?= 0x238
 CFLAGS+=	-DCOMPORT=${BOOT_COMCONSOLE_PORT}
 
 BOOT_COMCONSOLE_SPEED?= 9600
 CFLAGS+=	-DCOMSPEED=${BOOT_COMCONSOLE_SPEED}
 
-# the location of libstand
-CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand/
-
 .ifdef(BOOT_BIOSDISK_DEBUG)
 # Make the disk code more talkative
 CFLAGS+= -DDISK_DEBUG
@@ -34,6 +25,14 @@ CFLAGS+= -DDISK_DEBUG
 # Include simple terminal emulation (cons25-compatible)
 CFLAGS+= -DTERM_EMU
 
+CFLAGS+=	-DPC98
+CFLAGS+=	-I${.CURDIR}/../../common -I${.CURDIR}/../btx/lib \
+		-I${.CURDIR}/../../i386/libi386 \
+		-I${.CURDIR}/../../../contrib/dev/acpica \
+		-I${.CURDIR}/../../.. -I.
+# the location of libstand
+CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand/
+
 # Make "machine" required for all objects
 # (based on the more complete case in sys/i386/boot/Makefile.inc)
 ${SRCS:M*.c:R:S/$/.o/g}: machine