[src/trunk]: src use SUBDIR.roff suggested by uwe@

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8eb9da0149de
branches:  trunk
changeset: 319774:8eb9da0149de
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Jun 10 17:55:11 2018 +0000

description:
use SUBDIR.roff suggested by uwe@

diffstat:

 bin/csh/Makefile               |  4 ++--
 bin/sh/Makefile                |  4 ++--
 external/bsd/nvi/docs/Makefile |  5 +++--
 games/trek/Makefile            |  4 ++--
 lib/libcurses/Makefile         |  4 ++--
 share/Makefile                 |  4 +++-
 share/mk/bsd.subdir.mk         |  9 +++++----
 usr.bin/mail/Makefile          |  4 ++--
 usr.bin/make/Makefile          |  4 ++--
 usr.sbin/lpr/Makefile          |  4 ++--
 usr.sbin/timed/Makefile        |  4 ++--
 11 files changed, 27 insertions(+), 23 deletions(-)

diffs (195 lines):

diff -r 0bb3e2f640e5 -r 8eb9da0149de bin/csh/Makefile
--- a/bin/csh/Makefile  Sun Jun 10 17:54:51 2018 +0000
+++ b/bin/csh/Makefile  Sun Jun 10 17:55:11 2018 +0000
@@ -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 @@
            ${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 -r 0bb3e2f640e5 -r 8eb9da0149de bin/sh/Makefile
--- a/bin/sh/Makefile   Sun Jun 10 17:54:51 2018 +0000
+++ b/bin/sh/Makefile   Sun Jun 10 17:55:11 2018 +0000
@@ -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 <bsd.own.mk>
@@ -87,7 +87,7 @@
 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 -r 0bb3e2f640e5 -r 8eb9da0149de external/bsd/nvi/docs/Makefile
--- a/external/bsd/nvi/docs/Makefile    Sun Jun 10 17:54:51 2018 +0000
+++ b/external/bsd/nvi/docs/Makefile    Sun Jun 10 17:55:11 2018 +0000
@@ -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 <bsd.subdir.mk>
diff -r 0bb3e2f640e5 -r 8eb9da0149de games/trek/Makefile
--- a/games/trek/Makefile       Sun Jun 10 17:54:51 2018 +0000
+++ b/games/trek/Makefile       Sun Jun 10 17:55:11 2018 +0000
@@ -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 @@
 LDADD= -lm
 HIDEGAME=hidegame
 
-SUBDIR+=USD.doc
+SUBDIR.roff+=USD.doc
 
 COPTS.getpar.c += -Wno-format-nonliteral
 
diff -r 0bb3e2f640e5 -r 8eb9da0149de lib/libcurses/Makefile
--- a/lib/libcurses/Makefile    Sun Jun 10 17:54:51 2018 +0000
+++ b/lib/libcurses/Makefile    Sun Jun 10 17:55:11 2018 +0000
@@ -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 <bsd.own.mk>
@@ -198,7 +198,7 @@
         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 -r 0bb3e2f640e5 -r 8eb9da0149de share/Makefile
--- a/share/Makefile    Sun Jun 10 17:54:51 2018 +0000
+++ b/share/Makefile    Sun Jun 10 17:55:11 2018 +0000
@@ -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 @@
 .endif
 .endif
 
+SUBDIR.roff+= doc
+
 # Speedup stubs for some subtrees that don't need to run these rules
 includes-examples includes-man:
        @true
diff -r 0bb3e2f640e5 -r 8eb9da0149de share/mk/bsd.subdir.mk
--- a/share/mk/bsd.subdir.mk    Sun Jun 10 17:54:51 2018 +0000
+++ b/share/mk/bsd.subdir.mk    Sun Jun 10 17:55:11 2018 +0000
@@ -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 <bsd.init.mk>
@@ -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,8 +26,11 @@
 .endif
 .endif
 .endif
+.endfor
+
+.if ${MKGROFF} == "yes"
+__REALSUBDIR+=${SUBDIR.roff}
 .endif
-.endfor
 
 __recurse: .USE
        @${MAKEDIRTARGET} ${.TARGET:C/^[^-]*-//} ${.TARGET:C/-.*$//}
diff -r 0bb3e2f640e5 -r 8eb9da0149de usr.bin/mail/Makefile
--- a/usr.bin/mail/Makefile     Sun Jun 10 17:54:51 2018 +0000
+++ b/usr.bin/mail/Makefile     Sun Jun 10 17:55:11 2018 +0000
@@ -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 <bsd.own.mk>
@@ -71,7 +71,7 @@
 FILES=                 mail.help mail.tildehelp
 .endif
 
-SUBDIR+= USD.doc
+SUBDIR.roff+= USD.doc
 
 CONFIGFILES=           mail.rc
 FILESDIR_mail.rc=      /etc
diff -r 0bb3e2f640e5 -r 8eb9da0149de usr.bin/make/Makefile
--- a/usr.bin/make/Makefile     Sun Jun 10 17:54:51 2018 +0000
+++ b/usr.bin/make/Makefile     Sun Jun 10 17:55:11 2018 +0000
@@ -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 @@
 .endif
 
 .PATH: ${.CURDIR}/lst.lib
-SUBDIR=        PSD.doc
+SUBDIR.roff+=  PSD.doc
 .if make(obj) || make(clean)
 SUBDIR+= unit-tests
 .endif
diff -r 0bb3e2f640e5 -r 8eb9da0149de usr.sbin/lpr/Makefile
--- a/usr.sbin/lpr/Makefile     Sun Jun 10 17:54:51 2018 +0000
+++ b/usr.sbin/lpr/Makefile     Sun Jun 10 17:55:11 2018 +0000
@@ -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 <bsd.subdir.mk>
diff -r 0bb3e2f640e5 -r 8eb9da0149de usr.sbin/timed/Makefile
--- a/usr.sbin/timed/Makefile   Sun Jun 10 17:54:51 2018 +0000
+++ b/usr.sbin/timed/Makefile   Sun Jun 10 17:55:11 2018 +0000
@@ -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 <bsd.subdir.mk>