5 files changed, 14 insertions, 18 deletions
diff --git a/sys/boot/i386/boot0/Makefile b/sys/boot/i386/boot0/Makefile
index 2a36e40..40ebc8f 100644
--- a/sys/boot/i386/boot0/Makefile
+++ b/sys/boot/i386/boot0/Makefile
@@ -1,12 +1,10 @@
 # $FreeBSD$
 
-PROG=	${BOOT}
-INTERNALPROG=
-FILES=	${BOOT}
+PROG?=	boot0
+STRIP=
+BINMODE=${NOBINMODE}
 NOMAN=
-SRCS=	${BOOT}.S
-
-BOOT?=	boot0
+SRCS=	${PROG}.S
 
 # The default set of flags compiled into boot0.  This enables update (writing
 # the modified boot0 back to disk after running so that the selection made is
diff --git a/sys/boot/i386/boot0ext/Makefile b/sys/boot/i386/boot0ext/Makefile
index 3458fc1..e68e237 100644
--- a/sys/boot/i386/boot0ext/Makefile
+++ b/sys/boot/i386/boot0ext/Makefile
@@ -2,6 +2,6 @@
 
 .PATH: ${.CURDIR}/../boot0
 
-BOOT=	boot0ext
+PROG=	boot0ext
 
 .include "${.CURDIR}/../boot0/Makefile"
diff --git a/sys/boot/i386/boot0sio/Makefile b/sys/boot/i386/boot0sio/Makefile
index a6b6ae1..1321dd3 100644
--- a/sys/boot/i386/boot0sio/Makefile
+++ b/sys/boot/i386/boot0sio/Makefile
@@ -2,7 +2,7 @@
 
 .PATH: ${.CURDIR}/../boot0
 
-FILESNAME=	boot0sio
+PROGNAME=	boot0sio
 CFLAGS+=	-DSIO
 
 .include "${.CURDIR}/../boot0/Makefile"
diff --git a/sys/boot/i386/cdboot/Makefile b/sys/boot/i386/cdboot/Makefile
index 6cc382d..ddca825 100644
--- a/sys/boot/i386/cdboot/Makefile
+++ b/sys/boot/i386/cdboot/Makefile
@@ -1,12 +1,11 @@
 # $FreeBSD$
 
-PROG=	${BOOT}
-INTERNALPROG=
-FILES=	${BOOT}
+PROG=	cdboot
+STRIP=
+BINMODE=${NOBINMODE}
 NOMAN=
-SRCS=	${BOOT}.s
+SRCS=	${PROG}.s
 
-BOOT=	cdboot
 ORG=	0x7c00
 
 LDFLAGS=-N -e start -Ttext ${ORG} -Wl,-S,--oformat,binary
diff --git a/sys/boot/i386/mbr/Makefile b/sys/boot/i386/mbr/Makefile
index 43320e1..2eb349c 100644
--- a/sys/boot/i386/mbr/Makefile
+++ b/sys/boot/i386/mbr/Makefile
@@ -1,12 +1,11 @@
 # $FreeBSD$
 
-PROG=	${BOOT}
-INTERNALPROG=
-FILES=	${BOOT}
+PROG=	mbr
+STRIP=
+BINMODE=${NOBINMODE}
 NOMAN=
-SRCS=	${BOOT}.s
+SRCS=	${PROG}.s
 
-BOOT=	mbr
 ORG=	0x600
 
 LDFLAGS=-N -e start -Ttext ${ORG} -Wl,-S,--oformat,binary