Move BINDIR definition to defs.mk, and override where it isn't /boot

(those files already do that so weren't changed). Sponsored by: Netflix
svn path=/head/; revision=324981
2017-10-25 15:27:58 +00:00 · 2017-10-25 15:27:58 +00:00 · b533f63ed0 · 2020-12-20 02:59:44 +00:00
commit b533f63ed0
parent 2125122d25
13 changed files with 3 additions and 14 deletions
--- a/sys/boot/arm/uboot/Makefile
+++ b/sys/boot/arm/uboot/Makefile
@ -5,7 +5,6 @@
 FILES=		ubldr ubldr.bin

 NEWVERSWHAT=	"U-Boot loader" ${MACHINE_ARCH}
-BINDIR?=	/boot
 INSTALLFLAGS=	-b
 WARNS?=		1
 # Address at which ubldr will be loaded.
--- a/sys/boot/defs.mk
+++ b/sys/boot/defs.mk
@ -15,6 +15,9 @@ UBOOTSRC=	${BOOTSRC}/uboot

 BOOTOBJ=	${OBJTOP}/sys/boot

+# BINDIR is where we install
+BINDIR?=	/boot
+
 # NB: The makefiles depend on these being empty when we don't build forth.
 .if ${MK_FORTH} != "no"
 LIBFICL=	${BOOTOBJ}/ficl/libficl.a
--- a/sys/boot/efi/Makefile.inc
+++ b/sys/boot/efi/Makefile.inc
@ -1,7 +1,5 @@
 # $FreeBSD$

-BINDIR?=	/boot
-
 .if ${MACHINE_CPUARCH} == "i386"
 CFLAGS+=        -march=i386
 CFLAGS+=	-mno-aes
--- a/sys/boot/i386/Makefile.inc
+++ b/sys/boot/i386/Makefile.inc
@ -2,8 +2,6 @@
 #
 # $FreeBSD$

-BINDIR?=	/boot
-
 LOADER_ADDRESS?=0x200000
 CFLAGS+=	-march=i386 -ffreestanding
 CFLAGS.gcc+=	-mpreferred-stack-boundary=2
--- a/sys/boot/mips/beri/Makefile.inc
+++ b/sys/boot/mips/beri/Makefile.inc
@ -1,6 +1,5 @@
 # $FreeBSD$

-BINDIR?=	/boot
 CFLAGS+=	-ffreestanding
 LDFLAGS+=	-nostdlib

--- a/sys/boot/mips/beri/boot2/Makefile
+++ b/sys/boot/mips/beri/boot2/Makefile
@ -29,7 +29,6 @@
 #
 # $FreeBSD$

-BINDIR?=	/boot
 INSTALLFLAGS=	-b

 LOADERS=	flashboot jtagboot
--- a/sys/boot/mips/uboot/Makefile
+++ b/sys/boot/mips/uboot/Makefile
@ -5,7 +5,6 @@
 FILES=		ubldr

 NEWVERSWHAT=	"U-Boot loader" ${MACHINE_ARCH}
-BINDIR?=	/boot
 INSTALLFLAGS=	-b
 WARNS?=		1
 # Address at which ubldr will be loaded.
--- a/sys/boot/powerpc/boot1.chrp/Makefile
+++ b/sys/boot/powerpc/boot1.chrp/Makefile
@ -4,7 +4,6 @@ SSP_CFLAGS=

 PROG=           boot1.elf
 NEWVERSWHAT=    "Open Firmware boot block" ${MACHINE_ARCH}
-BINDIR?=        /boot
 INSTALLFLAGS=   -b

 FILES=		boot1.hfs
--- a/sys/boot/powerpc/kboot/Makefile
+++ b/sys/boot/powerpc/kboot/Makefile
@ -6,7 +6,6 @@ MAN=

 PROG=		loader.kboot
 NEWVERSWHAT=	"kboot loader" ${MACHINE_ARCH}
-BINDIR?=	/boot
 INSTALLFLAGS=	-b

 # Architecture-specific loader code
--- a/sys/boot/powerpc/ofw/Makefile
+++ b/sys/boot/powerpc/ofw/Makefile
@ -6,7 +6,6 @@ MAN=

 PROG=		loader
 NEWVERSWHAT=	"Open Firmware loader" ${MACHINE_ARCH}
-BINDIR?=	/boot
 INSTALLFLAGS=	-b

 # Architecture-specific loader code
--- a/sys/boot/powerpc/ps3/Makefile
+++ b/sys/boot/powerpc/ps3/Makefile
@ -6,7 +6,6 @@ MAN=

 PROG=		loader.ps3
 NEWVERSWHAT=	"Playstation 3 loader" ${MACHINE_ARCH}
-BINDIR?=	/boot
 INSTALLFLAGS=	-b

 # Architecture-specific loader code
--- a/sys/boot/powerpc/uboot/Makefile
+++ b/sys/boot/powerpc/uboot/Makefile
@ -4,7 +4,6 @@

 PROG=		ubldr
 NEWVERSWHAT=	"U-Boot loader" ${MACHINE_ARCH}
-BINDIR?=	/boot
 INSTALLFLAGS=	-b
 MAN=

--- a/sys/boot/sparc64/Makefile.inc
+++ b/sys/boot/sparc64/Makefile.inc
@ -1,6 +1,5 @@
 # $FreeBSD$

-BINDIR?=	/boot
 CFLAGS+=	-ffreestanding
 LDFLAGS+=	-nostdlib