From 968ecff61c9aa4c737d0f615853a5fedcd12a073 Mon Sep 17 00:00:00 2001
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Fri, 6 Feb 2004 12:58:32 +0000
Subject: [PATCH] Inherit BINDIR from a parent Makefile.inc.

---
 sys/boot/i386/Makefile.inc     | 2 ++
 sys/boot/i386/boot0/Makefile   | 1 -
 sys/boot/i386/boot2/Makefile   | 1 -
 sys/boot/i386/cdboot/Makefile  | 1 -
 sys/boot/i386/gptboot/Makefile | 1 -
 sys/boot/i386/loader/Makefile  | 1 -
 sys/boot/i386/mbr/Makefile     | 1 -
 sys/boot/i386/pxeldr/Makefile  | 1 -
 8 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/sys/boot/i386/Makefile.inc b/sys/boot/i386/Makefile.inc
index f390a08c46c7..2d126f4092f8 100644
--- a/sys/boot/i386/Makefile.inc
+++ b/sys/boot/i386/Makefile.inc
@@ -2,6 +2,8 @@
 #
 # $FreeBSD$
 
+BINDIR?=	/boot
+
 LOADER_ADDRESS?=	0x200000
 CFLAGS+=		-ffreestanding -mpreferred-stack-boundary=2
 
diff --git a/sys/boot/i386/boot0/Makefile b/sys/boot/i386/boot0/Makefile
index 057268b94e9e..44fdfbce7b15 100644
--- a/sys/boot/i386/boot0/Makefile
+++ b/sys/boot/i386/boot0/Makefile
@@ -3,7 +3,6 @@
 PROG?=		boot0
 NOMAN=
 STRIP=
-BINDIR?=	/boot
 BINMODE=	444
 
 M4?=	m4
diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile
index aa8c0cd448fe..4c884a43ada1 100644
--- a/sys/boot/i386/boot2/Makefile
+++ b/sys/boot/i386/boot2/Makefile
@@ -3,7 +3,6 @@
 PROG=		boot2
 NOMAN=
 STRIP=
-BINDIR?=	/boot
 BINMODE=	444
 CLEANFILES=	boot boot1 boot1.out boot1.o \
 		boot2.ldr boot2.bin boot2.ld boot2.out boot2.o boot2.h \
diff --git a/sys/boot/i386/cdboot/Makefile b/sys/boot/i386/cdboot/Makefile
index 9e8e8136933c..20ff9f95e8ff 100644
--- a/sys/boot/i386/cdboot/Makefile
+++ b/sys/boot/i386/cdboot/Makefile
@@ -7,7 +7,6 @@ ORG=		0x7c00
 PROG=		cdboot
 NOMAN=
 STRIP=
-BINDIR?=	/boot
 
 ${PROG}: ${PROG}.o
 	${LD} -N -e start -Ttext ${ORG} -o ${PROG}.out ${PROG}.o
diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile
index aa8c0cd448fe..4c884a43ada1 100644
--- a/sys/boot/i386/gptboot/Makefile
+++ b/sys/boot/i386/gptboot/Makefile
@@ -3,7 +3,6 @@
 PROG=		boot2
 NOMAN=
 STRIP=
-BINDIR?=	/boot
 BINMODE=	444
 CLEANFILES=	boot boot1 boot1.out boot1.o \
 		boot2.ldr boot2.bin boot2.ld boot2.out boot2.o boot2.h \
diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile
index 4d87aa316ea6..dce1cf2c2f1c 100644
--- a/sys/boot/i386/loader/Makefile
+++ b/sys/boot/i386/loader/Makefile
@@ -3,7 +3,6 @@
 PROG=		loader
 STRIP=
 NEWVERSWHAT=	"bootstrap loader" i386
-BINDIR?=	/boot
 INSTALLFLAGS=	-b
 
 # architecture-specific loader code
diff --git a/sys/boot/i386/mbr/Makefile b/sys/boot/i386/mbr/Makefile
index 50add6321ab5..8fa64e12cc3f 100644
--- a/sys/boot/i386/mbr/Makefile
+++ b/sys/boot/i386/mbr/Makefile
@@ -3,7 +3,6 @@
 PROG=		mbr
 NOMAN=
 STRIP=
-BINDIR?=	/boot
 BINMODE=	444
 
 ORG=	0x600
diff --git a/sys/boot/i386/pxeldr/Makefile b/sys/boot/i386/pxeldr/Makefile
index f47159542ef2..9e533cb355d3 100644
--- a/sys/boot/i386/pxeldr/Makefile
+++ b/sys/boot/i386/pxeldr/Makefile
@@ -10,7 +10,6 @@ LOADER=		loader
 PROG=		${BOOT}
 MAN=		${BOOT}.8
 STRIP=
-BINDIR?=	/boot
 M4?=		m4
 
 .if defined(BOOT_PXELDR_PROBE_KEYBOARD)