From 949199a212ec714eab77ee2dc9b95252eb32ca2c Mon Sep 17 00:00:00 2001
From: Jessica Clarke <jrtc27@FreeBSD.org>
Date: Thu, 27 Jul 2023 05:10:44 +0100
Subject: [PATCH] etc: Automatically generate BSD.lib${libcompat}.dist lists

Note that each libcompat still has its own file that must exist.

Reviewed by:	brooks, jhb
Differential Revision:	https://reviews.freebsd.org/D41182
---
 etc/Makefile       | 10 +++++++---
 etc/mtree/Makefile | 10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/etc/Makefile b/etc/Makefile
index 528e348d6139..53d76ba8fdd7 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -4,6 +4,8 @@
 .include <src.opts.mk>
 .include <src.tools.mk>
 
+.include <bsd.compat.pre.mk>
+
 FILESGROUPS=	FILES
 NLS_ALIASES=	POSIX C \
 		en_US.US_ASCII C
@@ -104,10 +106,12 @@ MTREES=		mtree/BSD.root.dist		/		\
 		mtree/BSD.usr.dist		/usr		\
 		mtree/BSD.include.dist		/usr/include	\
 		mtree/BSD.debug.dist		/usr/lib
-.if ${MK_LIB32} != "no"
-MTREES+=	mtree/BSD.lib32.dist		/usr
-MTREES+=	mtree/BSD.lib32.dist		/usr/lib/debug/usr
+.for LIBCOMPAT libcompat in ${_ALL_LIBCOMPATS_libcompats}
+.if ${MK_LIB${LIBCOMPAT}} != "no"
+MTREES+=	mtree/BSD.lib${libcompat}.dist	/usr
+MTREES+=	mtree/BSD.lib${libcompat}.dist	/usr/lib/debug/usr
 .endif
+.endfor
 .if ${MK_TESTS} != "no"
 MTREES+=	mtree/BSD.tests.dist		${TESTSBASE}
 MTREES+=	mtree/BSD.tests.dist		/usr/lib/debug/${TESTSBASE}
diff --git a/etc/mtree/Makefile b/etc/mtree/Makefile
index 5dfefc9d5c21..b55e9d215b6c 100644
--- a/etc/mtree/Makefile
+++ b/etc/mtree/Makefile
@@ -2,6 +2,8 @@
 
 .include <src.opts.mk>
 
+.include <bsd.compat.pre.mk>
+
 PACKAGE=	mtree
 
 # NOTE: BSD.debug.dist is unconditionally installed for developer ease-of-use.
@@ -9,15 +11,17 @@ FILES=	\
 	BSD.debug.dist \
 	BSD.include.dist \
 	BSD.root.dist \
-	${_BSD.lib32.dist} \
+	${_BSD.libcompats.dist} \
 	${_BSD.sendmail.dist} \
 	${_BSD.tests.dist} \
 	BSD.usr.dist \
 	BSD.var.dist
 
-.if ${MK_LIB32} != "no"
-_BSD.lib32.dist=	BSD.lib32.dist
+.for LIBCOMPAT libcompat in ${_ALL_LIBCOMPATS_libcompats}
+.if ${MK_LIB${LIBCOMPAT}} != "no"
+_BSD.libcompats.dist+=	BSD.lib${libcompat}.dist
 .endif
+.endfor
 .if ${MK_SENDMAIL} != "no"
 _BSD.sendmail.dist=	BSD.sendmail.dist
 .endif