The branch stable/15 has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=32dd4b31dd9d3dfbe92a330ffe2bf49c8bdf7bf1
commit 32dd4b31dd9d3dfbe92a330ffe2bf49c8bdf7bf1 Author: Simon J. Gerraty <[email protected]> AuthorDate: 2026-01-11 02:44:40 +0000 Commit: Simon J. Gerraty <[email protected]> CommitDate: 2026-01-15 18:31:45 +0000 bsd.man.mk fix and simplify staging The STAGE_SETS need to match STAGE_DIR. For each STAGE_SET we have STAGE_DIR.${STAGE_SET} and create a target stage_files.${STAGE_SET}, the settings all need to be self consistent to work. We actually only need the high level targets stage_files and stage_links meta.stage.mk will take care of the details. (cherry picked from commit 9cd89fc5aa3c0e76375732788fe9d4282d65224f) (cherry picked from commit 9fed072b44223f061a0dbf604741091b3bc09aee) --- share/mk/bsd.man.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk index dde11afb8283..7490fd13aefc 100644 --- a/share/mk/bsd.man.mk +++ b/share/mk/bsd.man.mk @@ -252,10 +252,10 @@ _MANLINKS+= ${CATDIR}${_osect}${MANSUBDIR}/${_oname} \ .if defined(${__group}) && !empty(${__group}) .if ${MK_STAGING_MAN} == "yes" -STAGE_TARGETS+= stage_files.${__group} +STAGE_TARGETS+= stage_files _mansets.${__group}:= ${${__group}:E:O:u:M*[1-9]:@s@man$s@} -STAGE_SETS+= ${_mansets.${__group}} .for _page in ${${__group}} +STAGE_SETS+= ${__group}.man${_page:T:E} stage_files.${__group}.man${_page:T:E}: ${_page} .if target(${_page}${MCOMPRESS_EXT}) stage_files.${__group}.man${_page:T:E}: ${_page}${MCOMPRESS_EXT} @@ -263,8 +263,8 @@ stage_files.${__group}.man${_page:T:E}: ${_page}${MCOMPRESS_EXT} STAGE_DIR.${__group}.man${_page:T:E}?= ${STAGE_OBJTOP}${MANDIR}${_page:T:E}${MANSUBDIR} .endfor .if !defined(NO_MLINKS) && !empty(${__group}LINKS) +STAGE_TARGETS+= stage_links STAGE_SETS+= mlinks.${__group} -STAGE_TARGETS+= stage_links.${__group} STAGE_LINKS.mlinks.${__group}:= ${${__group}LINKS:M*.[1-9]:@f@${f:S,^,${MANDIR}${f:E}${MANSUBDIR}/,}@} stage_links.mlinks.${__group}: ${_mansets.${__group}:@s@stage_files.${__group}.$s@} .endif
