summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
Diffstat (limited to 'share')
-rw-r--r--share/mk/bsd.man.mk8
-rw-r--r--share/mk/bsd.opts.mk1
2 files changed, 5 insertions, 4 deletions
diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
index 5928e43..9a9b5be 100644
--- a/share/mk/bsd.man.mk
+++ b/share/mk/bsd.man.mk
@@ -127,7 +127,7 @@ _manpages: ${MAN}
ZEXT= ${MCOMPRESS_EXT}
.if defined(MAN) && !empty(MAN)
-.if ${MK_STAGING}
+.if ${MK_STAGING_MAN} == "yes"
staging: stage_files
_mansets:= ${MAN:E:O:u:@s@man$s@}
STAGE_SETS+= ${_mansets}
@@ -136,10 +136,10 @@ stage_files.man${_page:T:E}: ${_page}
STAGE_DIR.man${_page:T:E}?= ${STAGE_OBJTOP}${MANDIR}${_page:T:E}${MANSUBDIR}
.endfor
.if !empty(MLINKS)
+STAGE_SETS+= mlinks
staging: stage_links
-.for __section in ${MLINKS:E:O:u}
-STAGE_LINKS.man${__section}:= ${MLINKS:M*.${__section}:S,^,${MANDIR}${__section}${MANSUBDIR}/,}
-.endfor
+STAGE_LINKS.mlinks:= ${MLINKS:@f@${f:S,^,${MANDIR}${f:E}${MANSUBDIR}/,}@}
+stage_links.mlinks: ${_mansets:@s@stage_files.$s@}
.endif
.endif
diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk
index aa5c664..ce69653 100644
--- a/share/mk/bsd.opts.mk
+++ b/share/mk/bsd.opts.mk
@@ -72,6 +72,7 @@ __DEFAULT_NO_OPTIONS = \
# meta mode related
__DEFAULT_DEPENDENT_OPTIONS = \
+ STAGING_MAN/STAGING \
STAGING_PROG/STAGING
.include <bsd.mkopt.mk>
OpenPOWER on IntegriCloud