Inherit BINDIR from a parent Makefile.inc.

2004-02-06 12:58:32 +00:00 · 2004-02-06 12:58:32 +00:00 · 968ecff61c
commit 968ecff61c
parent 742816a54a
8 changed files with 2 additions and 7 deletions
--- 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

--- 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
--- 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 \
--- 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
--- 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 \
--- 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
--- 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
--- 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)