svn commit: r325743 - head/sys/boot/forth

[Warner Losh]

Author: imp
Date: Sun Nov 12 17:10:57 2017
New Revision: 325743
URL: https://svnweb.freebsd.org/changeset/base/325743

Log:
  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

Modified:
  head/sys/boot/forth/Makefile

Modified: head/sys/boot/forth/Makefile
==============================================================================
--- head/sys/boot/forth/Makefile	Sun Nov 12 09:42:42 2017	(r325742)
+++ head/sys/boot/forth/Makefile	Sun Nov 12 17:10:57 2017	(r325743)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.init.mk>
+
 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 <bsd.prog.mk>