From 24dfc36033c318e18ff3960525894351457ca335 Mon Sep 17 00:00:00 2001
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Tue, 20 Jan 2004 13:09:29 +0000
Subject: [PATCH] Normalize.

---
 share/Makefile            | 34 ++++++++++++++++++++++++++--------
 share/doc/papers/Makefile | 19 ++++++++++++++++---
 share/doc/psd/Makefile    | 28 +++++++++++++++++++++++-----
 share/doc/smm/Makefile    | 17 +++++++++++++----
 share/doc/usd/Makefile    | 15 +++++++++++++--
 5 files changed, 91 insertions(+), 22 deletions(-)

diff --git a/share/Makefile b/share/Makefile
index d79d7a4261ea..f1649bb9e1f8 100644
--- a/share/Makefile
+++ b/share/Makefile
@@ -3,19 +3,37 @@
 
 # Do not include `info' in the SUBDIR list, it is handled separately.
 
-SUBDIR= colldef dict examples man me misc mk mklocale monetdef \
-	msgdef numericdef skel syscons tabset termcap timedef zoneinfo
-
-.if !defined(NO_SHAREDOCS)
-SUBDIR+= doc
-.endif
+SUBDIR=	colldef \
+	dict \
+	${_doc} \
+	examples \
+	${_isdn} \
+	man \
+	me \
+	misc \
+	mk \
+	mklocale \
+	monetdef \
+	msgdef \
+	numericdef \
+	${_sendmail} \
+	skel \
+	syscons \
+	tabset \
+	termcap \
+	timedef \
+	zoneinfo
 
 .if !defined(NO_I4B)
-SUBDIR+= isdn
+_isdn=		isdn
 .endif
 
 .if !defined(NO_SENDMAIL)
-SUBDIR+= sendmail
+_sendmail=	 sendmail
+.endif
+
+.if !defined(NO_SHAREDOCS)
+_doc=		doc
 .endif
 
 .include <bsd.subdir.mk>
diff --git a/share/doc/papers/Makefile b/share/doc/papers/Makefile
index bc42c4720955..ecab6f4e5862 100644
--- a/share/doc/papers/Makefile
+++ b/share/doc/papers/Makefile
@@ -1,7 +1,20 @@
 # $FreeBSD$
 
-SUBDIR=	beyond4.3 bufbio diskperf fsinterface jail kernmalloc kerntune \
-	malloc newvm nqnfs px relengr sysperf devfs \
-	contents timecounter
+SUBDIR=	beyond4.3 \
+	bufbio \
+	contents \
+	devfs \
+	diskperf \
+	fsinterface \
+	jail \
+	kernmalloc \
+	kerntune \
+	malloc \
+	newvm \
+	nqnfs \
+	px \
+	relengr \
+	sysperf \
+	timecounter
 
 .include <bsd.subdir.mk>
diff --git a/share/doc/psd/Makefile b/share/doc/psd/Makefile
index 3524d50f0677..d50f05b1b2c6 100644
--- a/share/doc/psd/Makefile
+++ b/share/doc/psd/Makefile
@@ -11,13 +11,31 @@
 # the tree:
 # 11.adb
 
-SUBDIR=	 title contents 
-SUBDIR+=  01.cacm 02.implement 03.iosys 04.uprog 05.sysman 06.Clang 12.make 
-SUBDIR+=  13.rcs 15.yacc 16.lex 17.m4 18.gprof 20.ipctut 21.ipc
+SUBDIR=	title \
+	contents \
+	01.cacm \
+	02.implement \
+	03.iosys \
+	04.uprog \
+	05.sysman \
+	06.Clang \
+	12.make \
+	13.rcs \
+	15.yacc \
+	16.lex \
+	17.m4 \
+	18.gprof \
+	20.ipctut \
+	21.ipc
 
 # The following modules don't appear in the O'Reilly book, but
 # are in the 4.4BSD distribution.
-SUBDIR+= 22.rpcgen 23.rpc 24.xdr 25.xdrrfc 26.rpcrfc 27.nfsrpc
-SUBDIR+= 28.cvs
+SUBDIR+=22.rpcgen \
+	23.rpc \
+	24.xdr \
+	25.xdrrfc \
+	26.rpcrfc \
+	27.nfsrpc \
+	28.cvs
 
 .include <bsd.subdir.mk>
diff --git a/share/doc/smm/Makefile b/share/doc/smm/Makefile
index da7b2ca9947b..6f8afc463703 100644
--- a/share/doc/smm/Makefile
+++ b/share/doc/smm/Makefile
@@ -11,12 +11,21 @@
 # The following modules are built with their programs:
 # 07.lpd
 
-SUBDIR=	title contents 01.setup 02.config 03.fsck 04.quotas 05.fastfs \
-	06.nfs 11.timedop \
-	12.timed 18.net
+SUBDIR=	title \
+	contents \
+	01.setup \
+	02.config \
+	03.fsck \
+	04.quotas \
+	05.fastfs \
+	06.nfs \
+	${_08.sendmailop} \
+	11.timedop \
+	12.timed \
+	18.net
 
 .if !defined(NO_SENDMAIL)
-SUBDIR+=08.sendmailop 
+_08.sendmailop=	08.sendmailop 
 .endif
 
 .include <bsd.subdir.mk>
diff --git a/share/doc/usd/Makefile b/share/doc/usd/Makefile
index e06d449e4ef5..e7939feb6630 100644
--- a/share/doc/usd/Makefile
+++ b/share/doc/usd/Makefile
@@ -4,7 +4,18 @@
 # The following modules are not provided:
 # 14.jove
 
-SUBDIR=	title contents 04.csh 07.mail 10.exref 11.vitut 12.vi 13.viref \
-	18.msdiffs 19.memacros 20.meref 21.troff 22.trofftut
+SUBDIR=	title \
+	contents \
+	04.csh \
+	07.mail \
+	10.exref \
+	11.vitut \
+	12.vi \
+	13.viref \
+	18.msdiffs \
+	19.memacros \
+	20.meref \
+	21.troff \
+	22.trofftut
 
 .include <bsd.subdir.mk>