Module Name: src
Committed By: christos
Date: Sun Jun 10 17:55:12 UTC 2018
Modified Files:
src/bin/csh: Makefile
src/bin/sh: Makefile
src/external/bsd/nvi/docs: Makefile
src/games/trek: Makefile
src/lib/libcurses: Makefile
src/share: Makefile
src/share/mk: bsd.subdir.mk
src/usr.bin/mail: Makefile
src/usr.bin/make: Makefile
src/usr.sbin/lpr: Makefile
src/usr.sbin/timed: Makefile
Log Message:
use SUBDIR.roff suggested by uwe@
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/bin/csh/Makefile
cvs rdiff -u -r1.113 -r1.114 src/bin/sh/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/nvi/docs/Makefile
cvs rdiff -u -r1.15 -r1.16 src/games/trek/Makefile
cvs rdiff -u -r1.84 -r1.85 src/lib/libcurses/Makefile
cvs rdiff -u -r1.34 -r1.35 src/share/Makefile
cvs rdiff -u -r1.53 -r1.54 src/share/mk/bsd.subdir.mk
cvs rdiff -u -r1.37 -r1.38 src/usr.bin/mail/Makefile
cvs rdiff -u -r1.59 -r1.60 src/usr.bin/make/Makefile
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/lpr/Makefile
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/timed/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/csh/Makefile
diff -u src/bin/csh/Makefile:1.41 src/bin/csh/Makefile:1.42
--- src/bin/csh/Makefile:1.41 Sat Jul 5 19:12:33 2014
+++ src/bin/csh/Makefile Sun Jun 10 13:55:11 2018
@@ -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
Index: src/bin/sh/Makefile
diff -u src/bin/sh/Makefile:1.113 src/bin/sh/Makefile:1.114
--- src/bin/sh/Makefile:1.113 Fri Jun 30 19:05:45 2017
+++ src/bin/sh/Makefile Sun Jun 10 13:55:11 2018
@@ -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 @@ 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
Index: src/external/bsd/nvi/docs/Makefile
diff -u src/external/bsd/nvi/docs/Makefile:1.1 src/external/bsd/nvi/docs/Makefile:1.2
--- src/external/bsd/nvi/docs/Makefile:1.1 Fri Nov 22 11:00:45 2013
+++ src/external/bsd/nvi/docs/Makefile Sun Jun 10 13:55:11 2018
@@ -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>
Index: src/games/trek/Makefile
diff -u src/games/trek/Makefile:1.15 src/games/trek/Makefile:1.16
--- src/games/trek/Makefile:1.15 Sat Jul 5 15:22:03 2014
+++ src/games/trek/Makefile Sun Jun 10 13:55:11 2018
@@ -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
Index: src/lib/libcurses/Makefile
diff -u src/lib/libcurses/Makefile:1.84 src/lib/libcurses/Makefile:1.85
--- src/lib/libcurses/Makefile:1.84 Tue Jan 24 12:27:30 2017
+++ src/lib/libcurses/Makefile Sun Jun 10 13:55:11 2018
@@ -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 @@ MLINKS+= curses_addch.3 addch.3 curses_a
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
Index: src/share/Makefile
diff -u src/share/Makefile:1.34 src/share/Makefile:1.35
--- src/share/Makefile:1.34 Sun Jun 10 13:17:46 2018
+++ src/share/Makefile Sun Jun 10 13:55:11 2018
@@ -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
Index: src/share/mk/bsd.subdir.mk
diff -u src/share/mk/bsd.subdir.mk:1.53 src/share/mk/bsd.subdir.mk:1.54
--- src/share/mk/bsd.subdir.mk:1.53 Sun Jun 10 13:17:46 2018
+++ src/share/mk/bsd.subdir.mk Sun Jun 10 13:55:11 2018
@@ -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,9 +26,12 @@ __REALSUBDIR+=${dir}
.endif
.endif
.endif
-.endif
.endfor
+.if ${MKGROFF} == "yes"
+__REALSUBDIR+=${SUBDIR.roff}
+.endif
+
__recurse: .USE
@${MAKEDIRTARGET} ${.TARGET:C/^[^-]*-//} ${.TARGET:C/-.*$//}
Index: src/usr.bin/mail/Makefile
diff -u src/usr.bin/mail/Makefile:1.37 src/usr.bin/mail/Makefile:1.38
--- src/usr.bin/mail/Makefile:1.37 Tue May 22 21:03:46 2018
+++ src/usr.bin/mail/Makefile Sun Jun 10 13:55:11 2018
@@ -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 @@ FILESDIR= /usr/share/misc
FILES= mail.help mail.tildehelp
.endif
-SUBDIR+= USD.doc
+SUBDIR.roff+= USD.doc
CONFIGFILES= mail.rc
FILESDIR_mail.rc= /etc
Index: src/usr.bin/make/Makefile
diff -u src/usr.bin/make/Makefile:1.59 src/usr.bin/make/Makefile:1.60
--- src/usr.bin/make/Makefile:1.59 Thu Feb 18 15:33:40 2016
+++ src/usr.bin/make/Makefile Sun Jun 10 13:55:11 2018
@@ -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${FIL
.endif
.PATH: ${.CURDIR}/lst.lib
-SUBDIR= PSD.doc
+SUBDIR.roff+= PSD.doc
.if make(obj) || make(clean)
SUBDIR+= unit-tests
.endif
Index: src/usr.sbin/lpr/Makefile
diff -u src/usr.sbin/lpr/Makefile:1.11 src/usr.sbin/lpr/Makefile:1.12
--- src/usr.sbin/lpr/Makefile:1.11 Sat Jul 5 15:22:05 2014
+++ src/usr.sbin/lpr/Makefile Sun Jun 10 13:55:11 2018
@@ -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>
Index: src/usr.sbin/timed/Makefile
diff -u src/usr.sbin/timed/Makefile:1.5 src/usr.sbin/timed/Makefile:1.6
--- src/usr.sbin/timed/Makefile:1.5 Sat Jul 5 15:22:05 2014
+++ src/usr.sbin/timed/Makefile Sun Jun 10 13:55:11 2018
@@ -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>
