diff options
| author | sjg <sjg@FreeBSD.org> | 2015-06-04 19:11:56 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2015-06-04 19:11:56 +0000 |
| commit | 578bc7737e46a2d02679edbcdd9bfcc77524ca42 (patch) | |
| tree | 6e4be4f159bd0d499f01ec40ff1e8ce6aca011e3 /share | |
| parent | 05b6cdb1f47fdb5e027353357e4def2381278f2b (diff) | |
| download | FreeBSD-src-578bc7737e46a2d02679edbcdd9bfcc77524ca42.zip FreeBSD-src-578bc7737e46a2d02679edbcdd9bfcc77524ca42.tar.gz | |
Add dependent option STAGING_MAN/STAGING
Use a single mlinks set, since some libs (eg. libc) do cross section
links.
Diffstat (limited to 'share')
| -rw-r--r-- | share/mk/bsd.man.mk | 8 | ||||
| -rw-r--r-- | share/mk/bsd.opts.mk | 1 |
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> |
