diff --git a/bin/csh/Makefile b/bin/csh/Makefile index e6ca8e25d53f..269ee3622b73 100644 --- a/bin/csh/Makefile +++ b/bin/csh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2014/07/05 23:12:33 dholland Exp $ +# $NetBSD: Makefile,v 1.42 2018/06/10 17:55:11 christos Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # # C Shell with process control; VM/UNIX VAX Makefile @@ -52,7 +52,7 @@ const.h: const.c ${TOOL_SED} -e 's/Char \([a-zA-Z0-9_]*\)\(.*\)/extern Char \1[];/' | \ sort >> ${.TARGET} -SUBDIR+=USD.doc +SUBDIR.roff+=USD.doc COPTS.err.c = -Wno-format-nonliteral COPTS.printf.c = -Wno-format-nonliteral diff --git a/bin/sh/Makefile b/bin/sh/Makefile index 3c2e8f3be693..bc79597e1e67 100644 --- a/bin/sh/Makefile +++ b/bin/sh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.113 2017/06/30 23:05:45 kre Exp $ +# $NetBSD: Makefile,v 1.114 2018/06/10 17:55:11 christos Exp $ # @(#)Makefile 8.4 (Berkeley) 5/5/95 .include @@ -87,7 +87,7 @@ optinit.h: mkoptions.sh option.list NBCOMPATLIB= -L${TOOLDIR}/lib -lnbcompat .endif -SUBDIR+=USD.doc +SUBDIR.roff+=USD.doc COPTS.printf.c = -Wno-format-nonliteral COPTS.jobs.c = -Wno-format-nonliteral diff --git a/external/bsd/nvi/docs/Makefile b/external/bsd/nvi/docs/Makefile index da65a86520ee..cd5c74563ee5 100644 --- a/external/bsd/nvi/docs/Makefile +++ b/external/bsd/nvi/docs/Makefile @@ -1,5 +1,6 @@ -# $NetBSD: Makefile,v 1.1 2013/11/22 16:00:45 christos Exp $ +# $NetBSD: Makefile,v 1.2 2018/06/10 17:55:11 christos Exp $ -SUBDIR= USD.doc info +SUBDIR= info +SUBDIR.roff= USD.doc .include diff --git a/games/trek/Makefile b/games/trek/Makefile index b0cb2996ce90..1f80d74c4f55 100644 --- a/games/trek/Makefile +++ b/games/trek/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2014/07/05 19:22:03 dholland Exp $ +# $NetBSD: Makefile,v 1.16 2018/06/10 17:55:11 christos Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 PROG= trek @@ -15,7 +15,7 @@ DPADD= ${LIBM} LDADD= -lm HIDEGAME=hidegame -SUBDIR+=USD.doc +SUBDIR.roff+=USD.doc COPTS.getpar.c += -Wno-format-nonliteral diff --git a/lib/libcurses/Makefile b/lib/libcurses/Makefile index 19be1af19894..7689d2b66978 100644 --- a/lib/libcurses/Makefile +++ b/lib/libcurses/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.84 2017/01/24 17:27:30 roy Exp $ +# $NetBSD: Makefile,v 1.85 2018/06/10 17:55:11 christos Exp $ # @(#)Makefile 8.2 (Berkeley) 1/2/94 .include @@ -198,7 +198,7 @@ MLINKS+= curses_addch.3 addch.3 curses_addchstr.3 addchnstr.3 \ curses_touch.3 wtouchln.3 curses_underscore.3 wunderend.3 \ curses_underscore.3 wunderscore.3 curses_line.3 wvline.3 -SUBDIR+= PSD.doc +SUBDIR.roff+= PSD.doc fileio.h: shlib_version genfileioh.awk ${TOOL_AWK} -f ${.CURDIR}/genfileioh.awk < ${.CURDIR}/shlib_version > ${.CURDIR}/fileio.h diff --git a/share/Makefile b/share/Makefile index cd0df787b028..6efe7f71350d 100644 --- a/share/Makefile +++ b/share/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2018/06/10 17:17:46 kamil Exp $ +# $NetBSD: Makefile,v 1.35 2018/06/10 17:55:11 christos Exp $ # from @(#)Makefile 8.1 (Berkeley) 6/5/93 # Missing: ms @@ -19,6 +19,8 @@ SUBDIR+=i18n locale nls .endif .endif +SUBDIR.roff+= doc + # Speedup stubs for some subtrees that don't need to run these rules includes-examples includes-man: @true diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk index e3455e7bbf55..bf74aafe9934 100644 --- a/share/mk/bsd.subdir.mk +++ b/share/mk/bsd.subdir.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.subdir.mk,v 1.53 2018/06/10 17:17:46 kamil Exp $ +# $NetBSD: bsd.subdir.mk,v 1.54 2018/06/10 17:55:11 christos Exp $ # @(#)bsd.subdir.mk 8.1 (Berkeley) 6/8/93 .include @@ -6,8 +6,6 @@ .if !defined(NOSUBDIR) # { .for dir in ${SUBDIR} -.if ("${dir}" != "USD.doc" && "${dir}" != "PSD.doc" && "${dir}" != "SMM.doc") \ - || ${MKGROFF} == "yes" .if "${dir}" == ".WAIT" # Don't play with .WAIT __REALSUBDIR+=${dir} @@ -28,9 +26,12 @@ __REALSUBDIR+=${dir} .endif .endif .endif -.endif .endfor +.if ${MKGROFF} == "yes" +__REALSUBDIR+=${SUBDIR.roff} +.endif + __recurse: .USE @${MAKEDIRTARGET} ${.TARGET:C/^[^-]*-//} ${.TARGET:C/-.*$//} diff --git a/usr.bin/mail/Makefile b/usr.bin/mail/Makefile index 961756402df5..dd388ec008b6 100644 --- a/usr.bin/mail/Makefile +++ b/usr.bin/mail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2018/05/23 01:03:46 christos Exp $ +# $NetBSD: Makefile,v 1.38 2018/06/10 17:55:11 christos Exp $ # @(#)Makefile 8.3 (Berkeley) 4/20/95 .include @@ -71,7 +71,7 @@ FILESDIR= /usr/share/misc FILES= mail.help mail.tildehelp .endif -SUBDIR+= USD.doc +SUBDIR.roff+= USD.doc CONFIGFILES= mail.rc FILESDIR_mail.rc= /etc diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile index 761ac6908f6d..9bc59abae9a3 100644 --- a/usr.bin/make/Makefile +++ b/usr.bin/make/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.59 2016/02/18 20:33:40 sjg Exp $ +# $NetBSD: Makefile,v 1.60 2018/06/10 17:55:11 christos Exp $ # @(#)Makefile 5.2 (Berkeley) 12/28/90 PROG= make @@ -24,7 +24,7 @@ COPTS.meta.c += -DHAVE_FILEMON_H -I${FILEMON_H:H} .endif .PATH: ${.CURDIR}/lst.lib -SUBDIR= PSD.doc +SUBDIR.roff+= PSD.doc .if make(obj) || make(clean) SUBDIR+= unit-tests .endif diff --git a/usr.sbin/lpr/Makefile b/usr.sbin/lpr/Makefile index 3a007875e8b3..b8fa15f7d0ad 100644 --- a/usr.sbin/lpr/Makefile +++ b/usr.sbin/lpr/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2014/07/05 19:22:05 dholland Exp $ +# $NetBSD: Makefile,v 1.12 2018/06/10 17:55:11 christos Exp $ # from: @(#)Makefile 8.1 (Berkeley) 6/6/93 SUBDIR= common_source .WAIT lp lpc lpd lpq lpr lprm lptest pac filters -SUBDIR+= SMM.doc +SUBDIR.roff+= SMM.doc .include diff --git a/usr.sbin/timed/Makefile b/usr.sbin/timed/Makefile index f0f7130d60f2..aa8d3c5425db 100644 --- a/usr.sbin/timed/Makefile +++ b/usr.sbin/timed/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2014/07/05 19:22:05 dholland Exp $ +# $NetBSD: Makefile,v 1.6 2018/06/10 17:55:11 christos Exp $ # @(#)Makefile 8.1 (Berkeley) 6/6/93 SUBDIR= timed timedc -SUBDIR+= SMM.doc +SUBDIR.roff+= SMM.doc .include