Create a subdirectory for every document. This make it easier to use

the default formating rules from <bsd.doc.mk>, especially for
PRINTERDEVICE=html.

5 files changed, 32 insertions, 29 deletions

diff --git a/share/doc/usd/12.vi/Makefile b/share/doc/usd/12.vi/Makefile
index d6d02b6e..c45870e 100644
--- a/share/doc/usd/12.vi/Makefile
+++ b/share/doc/usd/12.vi/Makefile
@@ -1,32 +1,6 @@
-#	From: @(#)Makefile	8.1 (Berkeley) 8/14/93
-#	$Id$
+#       $Id$
 
-VOLUME=	usd/12.vi
-SRCS=	vi.in vi.chars
-MACROS=	-ms
-CLEANFILES+=summary.* viapwh.*
-SRCDIR=	${.CURDIR}/../../../../contrib/nvi/docs/USD.doc/vitut
-USE_TBL=	yes
+SUBDIR=	vi viapwh summary 
 
-.include <bsd.doc.mk>
+.include <bsd.subdir.mk>
 
-.if !defined(NODOCCOMPRESS)
-SFILE=	summary.${PRINTERDEVICE}.gz
-VFILE=	viapwh.${PRINTERDEVICE}.gz
-.else
-SFILE=	summary.${PRINTERDEVICE}
-VFILE=	viapwh.${PRINTERDEVICE}
-.endif
-
-all:	${DFILE} ${SFILE} ${VFILE}
-
-${SFILE}: vi.summary
-	(cd ${SRCDIR}; ${ROFF} ${.ALLSRC}) | ${GZIPCMD} > ${.TARGET}
-
-${VFILE}: vi.apwh.ms
-	(cd ${SRCDIR}; ${ROFF} ${.ALLSRC}) | ${GZIPCMD} > ${.TARGET}
-
-afterinstall:
-	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-		${SFILE} ${VFILE} \
-		${DESTDIR}${BINDIR}/${VOLUME}
diff --git a/share/doc/usd/12.vi/Makefile.inc b/share/doc/usd/12.vi/Makefile.inc
new file mode 100644
index 0000000..8950c9b
--- /dev/null
+++ b/share/doc/usd/12.vi/Makefile.inc
@@ -0,0 +1,5 @@
+#	$Id$
+
+VOLUME=		usd/12.vi
+MACROS=		-ms
+USE_TBL=	yes
diff --git a/share/doc/usd/12.vi/summary/Makefile b/share/doc/usd/12.vi/summary/Makefile
new file mode 100644
index 0000000..1bb8ebc
--- /dev/null
+++ b/share/doc/usd/12.vi/summary/Makefile
@@ -0,0 +1,8 @@
+#	$Id$
+
+SRCS=	vi.summary
+DOC=	summary
+SRCDIR=	${.CURDIR}/../../../../../contrib/nvi/docs/USD.doc/vitut
+
+.include "../Makefile.inc"
+.include <bsd.doc.mk>
diff --git a/share/doc/usd/12.vi/vi/Makefile b/share/doc/usd/12.vi/vi/Makefile
new file mode 100644
index 0000000..145775f
--- /dev/null
+++ b/share/doc/usd/12.vi/vi/Makefile
@@ -0,0 +1,8 @@
+#	$Id$
+
+SRCS=	vi.in vi.chars
+#DOC=	tutorial
+SRCDIR=	${.CURDIR}/../../../../../contrib/nvi/docs/USD.doc/vitut
+
+.include "../Makefile.inc"
+.include <bsd.doc.mk>
diff --git a/share/doc/usd/12.vi/viapwh/Makefile b/share/doc/usd/12.vi/viapwh/Makefile
new file mode 100644
index 0000000..47a6f25
--- /dev/null
+++ b/share/doc/usd/12.vi/viapwh/Makefile
@@ -0,0 +1,8 @@
+#	$Id$
+
+SRCS=	vi.apwh.ms
+DOC=	viapwh
+SRCDIR=	${.CURDIR}/../../../../../contrib/nvi/docs/USD.doc/vitut
+
+.include "../Makefile.inc"
+.include <bsd.doc.mk>