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
This commit is contained in:
Jessica Clarke 2023-07-27 05:10:44 +01:00
parent 5e2bc2f60c
commit 949199a212
2 changed files with 14 additions and 6 deletions

View File

@ -4,6 +4,8 @@
.include <src.opts.mk> .include <src.opts.mk>
.include <src.tools.mk> .include <src.tools.mk>
.include <bsd.compat.pre.mk>
FILESGROUPS= FILES FILESGROUPS= FILES
NLS_ALIASES= POSIX C \ NLS_ALIASES= POSIX C \
en_US.US_ASCII C en_US.US_ASCII C
@ -104,10 +106,12 @@ MTREES= mtree/BSD.root.dist / \
mtree/BSD.usr.dist /usr \ mtree/BSD.usr.dist /usr \
mtree/BSD.include.dist /usr/include \ mtree/BSD.include.dist /usr/include \
mtree/BSD.debug.dist /usr/lib mtree/BSD.debug.dist /usr/lib
.if ${MK_LIB32} != "no" .for LIBCOMPAT libcompat in ${_ALL_LIBCOMPATS_libcompats}
MTREES+= mtree/BSD.lib32.dist /usr .if ${MK_LIB${LIBCOMPAT}} != "no"
MTREES+= mtree/BSD.lib32.dist /usr/lib/debug/usr MTREES+= mtree/BSD.lib${libcompat}.dist /usr
MTREES+= mtree/BSD.lib${libcompat}.dist /usr/lib/debug/usr
.endif .endif
.endfor
.if ${MK_TESTS} != "no" .if ${MK_TESTS} != "no"
MTREES+= mtree/BSD.tests.dist ${TESTSBASE} MTREES+= mtree/BSD.tests.dist ${TESTSBASE}
MTREES+= mtree/BSD.tests.dist /usr/lib/debug/${TESTSBASE} MTREES+= mtree/BSD.tests.dist /usr/lib/debug/${TESTSBASE}

View File

@ -2,6 +2,8 @@
.include <src.opts.mk> .include <src.opts.mk>
.include <bsd.compat.pre.mk>
PACKAGE= mtree PACKAGE= mtree
# NOTE: BSD.debug.dist is unconditionally installed for developer ease-of-use. # NOTE: BSD.debug.dist is unconditionally installed for developer ease-of-use.
@ -9,15 +11,17 @@ FILES= \
BSD.debug.dist \ BSD.debug.dist \
BSD.include.dist \ BSD.include.dist \
BSD.root.dist \ BSD.root.dist \
${_BSD.lib32.dist} \ ${_BSD.libcompats.dist} \
${_BSD.sendmail.dist} \ ${_BSD.sendmail.dist} \
${_BSD.tests.dist} \ ${_BSD.tests.dist} \
BSD.usr.dist \ BSD.usr.dist \
BSD.var.dist BSD.var.dist
.if ${MK_LIB32} != "no" .for LIBCOMPAT libcompat in ${_ALL_LIBCOMPATS_libcompats}
_BSD.lib32.dist= BSD.lib32.dist .if ${MK_LIB${LIBCOMPAT}} != "no"
_BSD.libcompats.dist+= BSD.lib${libcompat}.dist
.endif .endif
.endfor
.if ${MK_SENDMAIL} != "no" .if ${MK_SENDMAIL} != "no"
_BSD.sendmail.dist= BSD.sendmail.dist _BSD.sendmail.dist= BSD.sendmail.dist
.endif .endif