Use a single style for share/doc/ makefiles.

5 files changed, 6 insertions, 11 deletions

diff --git a/share/doc/usd/12.vi/Makefile b/share/doc/usd/12.vi/Makefile
index 0f885a0..7b2c080 100644
--- a/share/doc/usd/12.vi/Makefile
+++ b/share/doc/usd/12.vi/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SUBDIR=	vi viapwh summary 
+SUBDIR=	vi viapwh summary
 
 .include <bsd.subdir.mk>
 
diff --git a/share/doc/usd/12.vi/Makefile.inc b/share/doc/usd/12.vi/Makefile.inc
index d96b811..42d417f 100644
--- a/share/doc/usd/12.vi/Makefile.inc
+++ b/share/doc/usd/12.vi/Makefile.inc
@@ -2,3 +2,4 @@
 
 VOLUME=		usd/12.vi
 MACROS=		-ms
+SRCDIR=		${.CURDIR}/../../../../../contrib/nvi/docs/USD.doc/vitut
diff --git a/share/doc/usd/12.vi/summary/Makefile b/share/doc/usd/12.vi/summary/Makefile
index f931661..ab55a90 100644
--- a/share/doc/usd/12.vi/summary/Makefile
+++ b/share/doc/usd/12.vi/summary/Makefile
@@ -1,9 +1,7 @@
 # $FreeBSD$
 
-SRCS=	vi.summary
-DOC=	summary
-SRCDIR=	${.CURDIR}/../../../../../contrib/nvi/docs/USD.doc/vitut
-
+DOC=		summary
+SRCS=		vi.summary
 USE_TBL=	YES
 
 .include <bsd.doc.mk>
diff --git a/share/doc/usd/12.vi/vi/Makefile b/share/doc/usd/12.vi/vi/Makefile
index f740dc2..3809036 100644
--- a/share/doc/usd/12.vi/vi/Makefile
+++ b/share/doc/usd/12.vi/vi/Makefile
@@ -1,9 +1,6 @@
 # $FreeBSD$
 
-SRCS=	vi.in vi.chars
-#DOC=	tutorial
-SRCDIR=	${.CURDIR}/../../../../../contrib/nvi/docs/USD.doc/vitut
-
+SRCS=		vi.in vi.chars
 USE_TBL=	YES
 
 .include <bsd.doc.mk>
diff --git a/share/doc/usd/12.vi/viapwh/Makefile b/share/doc/usd/12.vi/viapwh/Makefile
index baad1ce..f20582d 100644
--- a/share/doc/usd/12.vi/viapwh/Makefile
+++ b/share/doc/usd/12.vi/viapwh/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
-SRCS=	vi.apwh.ms
 DOC=	viapwh
-SRCDIR=	${.CURDIR}/../../../../../contrib/nvi/docs/USD.doc/vitut
+SRCS=	vi.apwh.ms
 
 .include <bsd.doc.mk>