d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Ruslan Ermilov 2002-05-07 15:42:56 +00:00
parent 8782938772
commit afeaaa846c
5 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -85,7 +85,7 @@
TGTS= all all-man buildkernel buildworld checkdpadd clean \
cleandepend cleandir depend distribute distributeworld everything \
hierarchy includes install installcheck installkernel \
reinstallkernel installmost installworld libraries lint \
reinstallkernel installmost installworld libraries lint maninstall \
mk most obj objlink regress rerelease tags update
.ORDER: buildworld installworld

4
share/mk/bsd.lib.mk
View File

@ -184,7 +184,7 @@ _LIBS+=${LINTLIB}
all: objwarn ${_LIBS}
.if !defined(NOMAN)
all: all-man
all: _manpages
.endif
OBJS+= ${SRCS:N*.h:R:S/$/.o/g}
@ -348,7 +348,7 @@ _libinstall:
.endif
.if !defined(NOMAN)
realinstall: maninstall
realinstall: _maninstall
.endif
install: afterinstall

18
share/mk/bsd.man.mk
View File

@ -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}

4
share/mk/bsd.prog.mk
View File

@ -75,7 +75,7 @@ MAN1= ${MAN}
all: objwarn ${PROG} ${SCRIPTS} ${FILES}
.if !defined(NOMAN)
all: all-man
all: _manpages
.endif
CLEANFILES+= ${PROG} ${OBJS}
@ -201,7 +201,7 @@ _FILESINS_${file:T}: ${file}
.endif
.if !defined(NOMAN)
realinstall: maninstall
realinstall: _maninstall
.endif
install: afterinstall

4
share/mk/bsd.subdir.mk
View File

@ -25,7 +25,7 @@
# put the stuff into the right "distribution".
#
# afterinstall, all, all-man, beforeinstall, checkdpadd,
# clean, cleandepend, cleandir, depend, install, lint,
# clean, cleandepend, cleandir, depend, install, lint, maninstall,
# obj, objlink, realinstall, regress, tags
#
@ -58,7 +58,7 @@ ${SUBDIR}::
.for __target in all all-man checkdpadd clean cleandepend cleandir \
depend distribute lint \
depend distribute lint maninstall \
obj objlink realinstall regress tags
${__target}: _SUBDIR
.endfor