From 175748c9824ba72ffd68930377df45a22f93eaef Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Sun, 12 Nov 2017 17:10:57 +0000 Subject: [PATCH] Make sure the proper loader.rc gets installed. There were two things wrong. First, the wrong path was listed in .PATH statement. Second, BOOTSRC wasn't yet defined for the .PATH, so it didn't properly add it. Third, even if these were right, . was in the path before, so it wouldn't have worked. Replace this with a simple loop so the proper loader.rc gets selected. Noticed by: dhw@ (menus stopped working on boot) Sponsored by: Netflix --- sys/boot/forth/Makefile | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/sys/boot/forth/Makefile b/sys/boot/forth/Makefile index a0a55864fa5b..89a1ddf19c59 100644 --- a/sys/boot/forth/Makefile +++ b/sys/boot/forth/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +.include + MAN+= beastie.4th.8 \ brand.4th.8 \ check-password.4th.8 \ @@ -36,8 +38,13 @@ FILES+= support.4th FILES+= version.4th FILESDIR_loader.conf= /boot/defaults -# Everybody has these, but you can override -.PATH: ${BOOTSRC}/${MACHINE:C/amd64/i386/}/common ${BOOTSRC}/forth -FILES+= loader.rc menu.rc +# Allow machine specific loader.rc to be installed. +.for f in loader.rc menu.rc +.if exists(${BOOTSRC}/${MACHINE:C/amd64/i386/}/loader/${f}) +FILES+= ${BOOTSRC}/${MACHINE:C/amd64/i386/}/loader/${f} +.else +FILES+= ${f} +.endif +.endfor .include