Added internal, non-recursive (SUBDIR) versions of the `all-man'

and `maninstall' targets.  This fixes the issue where each subdir
was descended into twice during "make all", and also resurrects
the standardization of `maninstall'.

Urged by:	bde

1 files changed, 10 insertions, 8 deletions

diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
index 9c02b7748aa9..b07f01f42366 100644
--- a/share/mk/bsd.man.mk
+++ b/share/mk/bsd.man.mk
@@ -74,7 +74,8 @@ MAN+=	${MAN${sect}}
 .endfor
 .endif
 
-all-man:
+_manpages:
+all-man: _manpages
 
 .if defined(NOMANCOMPRESS)
 
@@ -94,13 +95,13 @@ CLEANFILES+=	${MAN:T:S/$/${FILTEXTENSION}/g}
 CLEANFILES+=	${MAN:T:S/$/${CATEXT}${FILTEXTENSION}/g}
 .for page in ${MAN}
 .for target in ${page:T:S/$/${FILTEXTENSION}/g}
-all-man: ${target}
+_manpages: ${target}
 ${target}: ${page}
 	${MANFILTER} < ${.ALLSRC} > ${.TARGET}
 .endfor
 .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
 .for target in ${page:T:S/$/${CATEXT}${FILTEXTENSION}/g}
-all-man: ${target}
+_manpages: ${target}
 ${target}: ${page}
 	${MANFILTER} < ${.ALLSRC} | ${MROFF_CMD} > ${.TARGET}
 .endfor
@@ -113,7 +114,7 @@ CLEANFILES+=	${MAN:T:S/$/${CATEXT}/g}
 .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
 .for page in ${MAN}
 .for target in ${page:T:S/$/${CATEXT}/g}
-all-man: ${target}
+_manpages: ${target}
 ${target}: ${page}
 	${MROFF_CMD} ${.ALLSRC} > ${.TARGET}
 .endfor
@@ -131,7 +132,7 @@ CLEANFILES+=	${MAN:T:S/$/${MCOMPRESS_EXT}/g}
 CLEANFILES+=	${MAN:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g}
 .for page in ${MAN}
 .for target in ${page:T:S/$/${MCOMPRESS_EXT}/}
-all-man: ${target}
+_manpages: ${target}
 ${target}: ${page}
 .if defined(MANFILTER)
 	${MANFILTER} < ${.ALLSRC} | ${MCOMPRESS_CMD} > ${.TARGET}
@@ -141,7 +142,7 @@ ${target}: ${page}
 .endfor
 .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
 .for target in ${page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/}
-all-man: ${target}
+_manpages: ${target}
 ${target}: ${page}
 .if defined(MANFILTER)
 	${MANFILTER} < ${.ALLSRC} | ${MROFF_CMD} | ${MCOMPRESS_CMD} > ${.TARGET}
@@ -155,9 +156,10 @@ ${target}: ${page}
 
 .endif
 
-maninstall:
+maninstall: _maninstall
+_maninstall:
 .if defined(MAN) && !empty(MAN)
-maninstall: ${MAN}
+_maninstall: ${MAN}
 .if defined(NOMANCOMPRESS)
 .if defined(MANFILTER)
 .for page in ${MAN}