Date: Sun, 22 Oct 2023 17:13:29 GMT From: "Simon J. Gerraty" <sjg@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: ea9a7058f93f - main - bsd.man.mk guard against empty vars in MLINKS Message-ID: <202310221713.39MHDTa5050295@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=ea9a7058f93f1bd533efadb592843bbfa26293a1 commit ea9a7058f93f1bd533efadb592843bbfa26293a1 Author: Simon J. Gerraty <sjg@FreeBSD.org> AuthorDate: 2023-10-22 17:13:20 +0000 Commit: Simon J. Gerraty <sjg@FreeBSD.org> CommitDate: 2023-10-22 17:13:20 +0000 bsd.man.mk guard against empty vars in MLINKS share/man/man4/Makefile adds a number of variables to MAN and MLINKS, which are only set for certain architectures. The empty variables wreak havoc when := is used. Add :M*.[1-9] to MLINKS reference for STAGE_LINKS.mlinks to avoid invalid results. Reviewed by: stevek --- share/mk/bsd.man.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk index 444144e6d626..25a0edcc7bc5 100644 --- a/share/mk/bsd.man.mk +++ b/share/mk/bsd.man.mk @@ -141,7 +141,7 @@ STAGE_DIR.man${_page:T:E}?= ${STAGE_OBJTOP}${MANDIR}${_page:T:E}${MANSUBDIR} .if !empty(MLINKS) STAGE_SETS+= mlinks STAGE_TARGETS+= stage_links -STAGE_LINKS.mlinks:= ${MLINKS:@f@${f:S,^,${MANDIR}${f:E}${MANSUBDIR}/,}@} +STAGE_LINKS.mlinks:= ${MLINKS:M*.[1-9]:@f@${f:S,^,${MANDIR}${f:E}${MANSUBDIR}/,}@} stage_links.mlinks: ${_mansets:@s@stage_files.$s@} .endif .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202310221713.39MHDTa5050295>