Date: Fri, 26 Feb 2016 22:13:31 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r296116 - head/share/mk Message-ID: <201602262213.u1QMDVjX033086@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Fri Feb 26 22:13:31 2016 New Revision: 296116 URL: https://svnweb.freebsd.org/changeset/base/296116 Log: Remove _manpages and _maninstall targets as they are no longer needed. r96164 added them to avoid recursing twice with _SUBDIR. That issue was fixed in bsd.subdir.mk in r291635 for all targets. Sponsored by: EMC / Isilon Storage Division Modified: head/share/mk/bsd.lib.mk head/share/mk/bsd.man.mk head/share/mk/bsd.prog.mk Modified: head/share/mk/bsd.lib.mk ============================================================================== --- head/share/mk/bsd.lib.mk Fri Feb 26 22:03:41 2016 (r296115) +++ head/share/mk/bsd.lib.mk Fri Feb 26 22:13:31 2016 (r296116) @@ -299,7 +299,7 @@ CLEANFILES+= ${_LIBS} .endif .if ${MK_MAN} != "no" && !defined(LIBRARIES_ONLY) -all: _manpages +all: all-man .endif .endif @@ -400,8 +400,8 @@ _libinstall: .include <bsd.links.mk> .if ${MK_MAN} != "no" && !defined(LIBRARIES_ONLY) -realinstall: _maninstall -.ORDER: beforeinstall _maninstall +realinstall: maninstall +.ORDER: beforeinstall maninstall .endif .endif Modified: head/share/mk/bsd.man.mk ============================================================================== --- head/share/mk/bsd.man.mk Fri Feb 26 22:03:41 2016 (r296115) +++ head/share/mk/bsd.man.mk Fri Feb 26 22:13:31 2016 (r296116) @@ -71,8 +71,7 @@ MAN+= ${MAN${__sect}} .endfor .endif -_manpages: -all-man: _manpages +all-man: .if ${MK_MANCOMPRESS} == "no" @@ -92,13 +91,13 @@ CLEANFILES+= ${MAN:T:S/$/${FILTEXTENSION CLEANFILES+= ${MAN:T:S/$/${CATEXT}${FILTEXTENSION}/g} .for __page in ${MAN} .for __target in ${__page:T:S/$/${FILTEXTENSION}/g} -_manpages: ${__target} +all-man: ${__target} ${__target}: ${__page} ${MANFILTER} < ${.ALLSRC} > ${.TARGET} .endfor .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) .for __target in ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} -_manpages: ${__target} +all-man: ${__target} ${__target}: ${__page} ${MANFILTER} < ${.ALLSRC} | ${MANDOC_CMD} > ${.TARGET} .endfor @@ -111,13 +110,13 @@ CLEANFILES+= ${MAN:T:S/$/${CATEXT}/g} .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) .for __page in ${MAN} .for __target in ${__page:T:S/$/${CATEXT}/g} -_manpages: ${__target} +all-man: ${__target} ${__target}: ${__page} ${MANDOC_CMD} ${.ALLSRC} > ${.TARGET} .endfor .endfor .else -_manpages: ${MAN} +all-man: ${MAN} .endif .endif .endif # defined(MANFILTER) @@ -147,7 +146,7 @@ CLEANFILES+= ${MAN:T:S/$/${MCOMPRESS_EXT CLEANFILES+= ${MAN:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} .for __page in ${MAN} .for __target in ${__page:T:S/$/${MCOMPRESS_EXT}/} -_manpages: ${__target} +all-man: ${__target} ${__target}: ${__page} .if defined(MANFILTER) ${MANFILTER} < ${.ALLSRC} | ${MCOMPRESS_CMD} > ${.TARGET} @@ -157,7 +156,7 @@ ${__target}: ${__page} .endfor .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) .for __target in ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/} -_manpages: ${__target} +all-man: ${__target} ${__target}: ${__page} .if defined(MANFILTER) ${MANFILTER} < ${.ALLSRC} | ${MANDOC_CMD} | ${MCOMPRESS_CMD} > ${.TARGET} @@ -182,10 +181,9 @@ _MANLINKS+= ${CATDIR}${_osect}${MANSUBDI .endfor .endif -maninstall: _maninstall -_maninstall: +maninstall: .if defined(MAN) && !empty(MAN) -_maninstall: ${MAN} +maninstall: ${MAN} .if ${MK_MANCOMPRESS} == "no" .if defined(MANFILTER) .for __page in ${MAN} Modified: head/share/mk/bsd.prog.mk ============================================================================== --- head/share/mk/bsd.prog.mk Fri Feb 26 22:03:41 2016 (r296115) +++ head/share/mk/bsd.prog.mk Fri Feb 26 22:13:31 2016 (r296116) @@ -150,7 +150,7 @@ all: .else all: ${PROG} ${SCRIPTS} .if ${MK_MAN} != "no" -all: _manpages +all: all-man .endif .endif @@ -258,8 +258,8 @@ NLSNAME?= ${PROG} .include <bsd.links.mk> .if ${MK_MAN} != "no" -realinstall: _maninstall -.ORDER: beforeinstall _maninstall +realinstall: maninstall +.ORDER: beforeinstall maninstall .endif .endif # !target(install)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602262213.u1QMDVjX033086>