From 4c887c21f434eb3caba38510af11ca855b346c25 Mon Sep 17 00:00:00 2001
From: Jessica Clarke <jrtc27@jrtc27.com>
Date: Fri, 2 Feb 2024 01:43:50 +0000
Subject: [PATCH] Makefile.inc1: Ensure etc installs last for -DNO_ROOT

Otherwise makewhatis can be run too early for -DNO_ROOT builds. This
makes use of the CheriBSD-specific SUBDIR_INSTALL_USE_DEPENDS option
until the dodginess has been resolved upstream, as is already done for
libexec's installing of libcompat rtld-elf variants.
---
 Makefile.inc1 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 4347e28c414e..2b513cb71937 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -499,6 +499,7 @@ SUBDIR+=	tools/cheribsdbox
 # installed.
 .if make(installworld) || make(install) || make(installsysroot)
 SUBDIR+=.WAIT
+SUBDIR_INSTALL_USE_DEPENDS=
 .endif
 .if !defined(SYSROOT_ONLY)
 SUBDIR+=etc