svn commit: r283996 - projects/bmake/share/mk

[Simon J. Gerraty]

Author: sjg
Date: Thu Jun  4 19:11:56 2015
New Revision: 283996
URL: https://svnweb.freebsd.org/changeset/base/283996

Log:
  Add dependent option STAGING_MAN/STAGING
  
  Use a single mlinks set, since some libs (eg. libc) do cross section
  links.

Modified:
  projects/bmake/share/mk/bsd.man.mk
  projects/bmake/share/mk/bsd.opts.mk

Modified: projects/bmake/share/mk/bsd.man.mk
==============================================================================
--- projects/bmake/share/mk/bsd.man.mk	Thu Jun  4 18:23:41 2015	(r283995)
+++ projects/bmake/share/mk/bsd.man.mk	Thu Jun  4 19:11:56 2015	(r283996)
@@ -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 at 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 at stage_files.$s@}
 .endif
 .endif
 

Modified: projects/bmake/share/mk/bsd.opts.mk
==============================================================================
--- projects/bmake/share/mk/bsd.opts.mk	Thu Jun  4 18:23:41 2015	(r283995)
+++ projects/bmake/share/mk/bsd.opts.mk	Thu Jun  4 19:11:56 2015	(r283996)
@@ -72,6 +72,7 @@ __DEFAULT_NO_OPTIONS = \
 
 # meta mode related
 __DEFAULT_DEPENDENT_OPTIONS = \
+    STAGING_MAN/STAGING \
     STAGING_PROG/STAGING
     
 .include <bsd.mkopt.mk>