From 173d80ed84e4eea0b48419ad76f0d6917ed7a98b Mon Sep 17 00:00:00 2001
From: tsutsui <tsutsui@NetBSD.org>
Date: Sun, 19 May 2024 15:43:24 +0000
Subject: [PATCH] Install cd9660 related system headers for tools
 installboot(8) builds.

---
 tools/Makefile.nbincludes | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tools/Makefile.nbincludes b/tools/Makefile.nbincludes
index efff65fe8411..ab52ad889f63 100644
--- a/tools/Makefile.nbincludes
+++ b/tools/Makefile.nbincludes
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.nbincludes,v 1.10 2024/04/01 02:18:30 christos Exp $
+#	$NetBSD: Makefile.nbincludes,v 1.11 2024/05/19 15:43:24 tsutsui Exp $
 
 .include <bsd.hostinit.mk>
 
@@ -6,12 +6,15 @@ _ARCHDIR:=	${.PARSEDIR}/../sys/arch
 _INCDIR:=	${.PARSEDIR}/../include
 _SYSDIR:=	${.PARSEDIR}/../sys/sys
 _UFSDIR:=	${.PARSEDIR}/../sys/ufs
+_FSDIR:=	${.PARSEDIR}/../sys/fs
 _SUBDIR!=	cd ${_ARCHDIR} && ${MAKE} -V SUBDIR
 
 .if make(depend) || make(all) || make(dependall) || make(install)
 # There's no need to run these commands for "make cleandir" or "make obj",
 # and TOOL_SED will not yet have been built.
 _UFS_INCS!=	cd ${_UFSDIR} && find ffs ufs -name '*.h'
+_FS_INCS!=	cd ${_FSDIR} && find cd9660 -name '*.h'
+_FS_INCS+=	unicode.h
 _ARCH_INCS!=	${TOOL_SED} -e 's/^\#.*//' ${.PARSEDIR}/headerlist
 .endif
 
@@ -34,6 +37,8 @@ beforedepend:
 	${HOST_INSTALL_DIR} ${TOOLDIR}/include/nbinclude
 	${HOST_INSTALL_DIR} ${TOOLDIR}/include/nbinclude/sys
 	${HOST_INSTALL_DIR} ${TOOLDIR}/include/nbinclude/ufs
+	${HOST_INSTALL_DIR} ${TOOLDIR}/include/nbinclude/fs
+	${HOST_INSTALL_DIR} ${TOOLDIR}/include/nbinclude/fs/cd9660
 	cd ${_ARCHDIR} && \
 	    ${TOOL_PAX} -s /include\\/// -rw ${_ARCH_INCS} \
 	    ${TOOLDIR}/include/nbinclude
@@ -43,5 +48,7 @@ beforedepend:
 	    ${TOOL_PAX} -rw ${_SYSINCS} ${TOOLDIR}/include/nbinclude/sys
 	cd ${_UFSDIR} && \
 	    ${TOOL_PAX} -rw ${_UFS_INCS} ${TOOLDIR}/include/nbinclude/ufs
+	cd ${_FSDIR} && \
+	    ${TOOL_PAX} -rw ${_FS_INCS} ${TOOLDIR}/include/nbinclude/fs
 	cd ${TOOLDIR}/include/nbinclude && rm -f machine && \
 	    ${HOST_INSTALL_SYMLINK} ${MACHINE} machine