Use doc.project.mk in place of docproj.docbook.mk.

Use the new ROOT_SYMLINKS variable where necessary.

16 files changed, 61 insertions, 129 deletions

diff --git a/Makefile b/Makefile
index 028109bcfe..f804456720 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.13 1999-08-26 19:40:04 nik Exp $
+# $Id: Makefile,v 1.14 1999-09-03 17:24:37 nik Exp $
 
 #
 # The user can override the default list of languages to build and install
@@ -14,4 +14,5 @@ SUBDIR+=	ru_RU.KOI8-R
 SUBDIR+=	zh_TW.Big5
 .endif
 
-.include <bsd.subdir.mk>
+DOC_PREFIX?=   ${.CURDIR}
+.include "${DOC_PREFIX}/share/mk/doc.subdir.mk"
diff --git a/en_US.ISO8859-1/Makefile b/en_US.ISO8859-1/Makefile
index 0f93fb7943..06c25da96b 100644
--- a/en_US.ISO8859-1/Makefile
+++ b/en_US.ISO8859-1/Makefile
@@ -1,22 +1,9 @@
-#       $Id: Makefile,v 1.5 1999-08-29 00:02:11 jhb Exp $
+#       $Id: Makefile,v 1.6 1999-09-03 17:24:38 nik Exp $
 
 SUBDIR = articles
 SUBDIR+= books
 
 COMPAT_SYMLINK = en
 
-#
-# Put the compatability symlink in place.
-#
-afterinstall:
-.if !defined(IGNORE_COMPAT_SYMLINK)
-	if [ ! -e ${DOCDIR}/${COMPAT_SYMLINK} ]; then			\
-		rm -rf ${DOCDIR}/${COMPAT_SYMLINK};			\
-		(cd ${DOCDIR} && ln -s en_US.ISO_8859-1 ${COMPAT_SYMLINK}); \
-	fi
-.endif
-
-.include <bsd.subdir.mk>
-
-DOC_PREFIX?= ..
-.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
+DOC_PREFIX?= ${.CURDIR}/..
+.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/books/Makefile b/en_US.ISO8859-1/books/Makefile
index 61e751b0fc..aa69b10835 100644
--- a/en_US.ISO8859-1/books/Makefile
+++ b/en_US.ISO8859-1/books/Makefile
@@ -1,7 +1,10 @@
-#       $Id: Makefile,v 1.3 1999-08-17 22:11:19 nik Exp $
+#       $Id: Makefile,v 1.4 1999-09-03 17:24:43 nik Exp $
 
 SUBDIR = faq
 SUBDIR+= fdp-primer
 SUBDIR+= handbook
 
-.include <bsd.subdir.mk>
+ROOT_SYMLINKS= faq handbook
+
+DOC_PREFIX?= ${.CURDIR}/../..
+.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO_8859-1/Makefile b/en_US.ISO_8859-1/Makefile
index 0f93fb7943..06c25da96b 100644
--- a/en_US.ISO_8859-1/Makefile
+++ b/en_US.ISO_8859-1/Makefile
@@ -1,22 +1,9 @@
-#       $Id: Makefile,v 1.5 1999-08-29 00:02:11 jhb Exp $
+#       $Id: Makefile,v 1.6 1999-09-03 17:24:38 nik Exp $
 
 SUBDIR = articles
 SUBDIR+= books
 
 COMPAT_SYMLINK = en
 
-#
-# Put the compatability symlink in place.
-#
-afterinstall:
-.if !defined(IGNORE_COMPAT_SYMLINK)
-	if [ ! -e ${DOCDIR}/${COMPAT_SYMLINK} ]; then			\
-		rm -rf ${DOCDIR}/${COMPAT_SYMLINK};			\
-		(cd ${DOCDIR} && ln -s en_US.ISO_8859-1 ${COMPAT_SYMLINK}); \
-	fi
-.endif
-
-.include <bsd.subdir.mk>
-
-DOC_PREFIX?= ..
-.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
+DOC_PREFIX?= ${.CURDIR}/..
+.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO_8859-1/books/Makefile b/en_US.ISO_8859-1/books/Makefile
index 61e751b0fc..aa69b10835 100644
--- a/en_US.ISO_8859-1/books/Makefile
+++ b/en_US.ISO_8859-1/books/Makefile
@@ -1,7 +1,10 @@
-#       $Id: Makefile,v 1.3 1999-08-17 22:11:19 nik Exp $
+#       $Id: Makefile,v 1.4 1999-09-03 17:24:43 nik Exp $
 
 SUBDIR = faq
 SUBDIR+= fdp-primer
 SUBDIR+= handbook
 
-.include <bsd.subdir.mk>
+ROOT_SYMLINKS= faq handbook
+
+DOC_PREFIX?= ${.CURDIR}/../..
+.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/es_ES.ISO8859-1/Makefile b/es_ES.ISO8859-1/Makefile
index 3c72a04df6..8c04116f30 100644
--- a/es_ES.ISO8859-1/Makefile
+++ b/es_ES.ISO8859-1/Makefile
@@ -1,21 +1,8 @@
-#       $Id: Makefile,v 1.5 1999-08-26 19:42:11 nik Exp $
+#       $Id: Makefile,v 1.6 1999-09-03 17:24:39 nik Exp $
 
 SUBDIR = books
 
 COMPAT_SYMLINK = es
 
-#
-# Put the compatability symlink in place.
-#
-afterinstall:
-.if !defined(IGNORE_COMPAT_SYMLINK)
-	if [ ! -e ${DOCDIR}/${COMPAT_SYMLINK} ]; then			\
-		rm -rf ${DOCDIR}/${COMPAT_SYMLINK};			\
-		(cd ${DOCDIR} && ln -s es_ES.ISO_8859-1 ${COMPAT_SYMLINK}); \
-	fi
-.endif
-
-.include <bsd.subdir.mk>
-
-DOC_PREFIX = ..
-.include "../share/mk/docproj.docbook.mk"
+DOC_PREFIX = ${.CURDIR}/..
+.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/es_ES.ISO8859-1/books/Makefile b/es_ES.ISO8859-1/books/Makefile
index 737ced1d20..0f7ac5cc2e 100644
--- a/es_ES.ISO8859-1/books/Makefile
+++ b/es_ES.ISO8859-1/books/Makefile
@@ -1,5 +1,8 @@
-#       $Id: Makefile,v 1.1 1999-08-19 00:07:57 nik Exp $
+#       $Id: Makefile,v 1.2 1999-09-03 17:24:44 nik Exp $
 
 SUBDIR = faq
 
-.include <bsd.subdir.mk>
+ROOT_SYMLINKS = faq
+
+DOC_PREFIX?= ${.CURDIR}/../..
+.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/es_ES.ISO_8859-1/Makefile b/es_ES.ISO_8859-1/Makefile
index 3c72a04df6..8c04116f30 100644
--- a/es_ES.ISO_8859-1/Makefile
+++ b/es_ES.ISO_8859-1/Makefile
@@ -1,21 +1,8 @@
-#       $Id: Makefile,v 1.5 1999-08-26 19:42:11 nik Exp $
+#       $Id: Makefile,v 1.6 1999-09-03 17:24:39 nik Exp $
 
 SUBDIR = books
 
 COMPAT_SYMLINK = es
 
-#
-# Put the compatability symlink in place.
-#
-afterinstall:
-.if !defined(IGNORE_COMPAT_SYMLINK)
-	if [ ! -e ${DOCDIR}/${COMPAT_SYMLINK} ]; then			\
-		rm -rf ${DOCDIR}/${COMPAT_SYMLINK};			\
-		(cd ${DOCDIR} && ln -s es_ES.ISO_8859-1 ${COMPAT_SYMLINK}); \
-	fi
-.endif
-
-.include <bsd.subdir.mk>
-
-DOC_PREFIX = ..
-.include "../share/mk/docproj.docbook.mk"
+DOC_PREFIX = ${.CURDIR}/..
+.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/es_ES.ISO_8859-1/books/Makefile b/es_ES.ISO_8859-1/books/Makefile
index 737ced1d20..0f7ac5cc2e 100644
--- a/es_ES.ISO_8859-1/books/Makefile
+++ b/es_ES.ISO_8859-1/books/Makefile
@@ -1,5 +1,8 @@
-#       $Id: Makefile,v 1.1 1999-08-19 00:07:57 nik Exp $
+#       $Id: Makefile,v 1.2 1999-09-03 17:24:44 nik Exp $
 
 SUBDIR = faq
 
-.include <bsd.subdir.mk>
+ROOT_SYMLINKS = faq
+
+DOC_PREFIX?= ${.CURDIR}/../..
+.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ja_JP.eucJP/Makefile b/ja_JP.eucJP/Makefile
index 60598598bf..d99f477294 100644
--- a/ja_JP.eucJP/Makefile
+++ b/ja_JP.eucJP/Makefile
@@ -1,4 +1,4 @@
-#       $Id: Makefile,v 1.10 1999-08-31 15:00:01 kuriyama Exp $
+#       $Id: Makefile,v 1.11 1999-09-03 17:24:40 nik Exp $
 #
 # Original revision: 1.5
 #
@@ -8,18 +8,5 @@ SUBDIR+= man
 
 COMPAT_SYMLINK = ja_JP.eucJP
 
-#
-# Put the compatability symlink in place.
-#
-afterinstall:
-.if !defined(IGNORE_COMPAT_SYMLINK)
-	if [ ! -e ${DOCDIR}/${COMPAT_SYMLINK} ]; then			\
-		rm -rf ${DOCDIR}/${COMPAT_SYMLINK};			\
-		(cd ${DOCDIR} && ln -s ja ${COMPAT_SYMLINK});		\
-	fi
-.endif
-
-.include <bsd.subdir.mk>
-
-DOC_PREFIX?= ..
-.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
+DOC_PREFIX?= ${.CURDIR}/..
+.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ja_JP.eucJP/books/Makefile b/ja_JP.eucJP/books/Makefile
index 7b93068344..a8c75c8323 100644
--- a/ja_JP.eucJP/books/Makefile
+++ b/ja_JP.eucJP/books/Makefile
@@ -1,6 +1,9 @@
-#       $Id: Makefile,v 1.3 1999-08-19 20:37:05 nik Exp $
+#       $Id: Makefile,v 1.4 1999-09-03 17:24:45 nik Exp $
 
 SUBDIR = faq
 SUBDIR+= handbook
 
-.include <bsd.subdir.mk>
+ROOT_SYMLINKS= faq handbook
+
+DOC_PREFIX?= ${.CURDIR}/../..
+.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ja_JP.eucJP/man/Makefile b/ja_JP.eucJP/man/Makefile
index db980ec78f..58ce6f1ac0 100644
--- a/ja_JP.eucJP/man/Makefile
+++ b/ja_JP.eucJP/man/Makefile
@@ -4,5 +4,6 @@ SUBDIR= man1 man5 man6 man7 man8
 makedb:
 	LANG=ja_JP.EUC jmakewhatis ${DESTDIR}${BINDIR}/man/ja/
 
-.include <bsd.subdir.mk>
+package:
 
+.include <bsd.subdir.mk>
diff --git a/ru_RU.KOI8-R/Makefile b/ru_RU.KOI8-R/Makefile
index 0adcec093f..27c22863aa 100644
--- a/ru_RU.KOI8-R/Makefile
+++ b/ru_RU.KOI8-R/Makefile
@@ -1,21 +1,8 @@
-#       $Id: Makefile,v 1.5 1999-08-29 16:52:23 nik Exp $
+#       $Id: Makefile,v 1.6 1999-09-03 17:24:41 nik Exp $
 
 SUBDIR = books
 
 COMPAT_SYMLINK = ru
 
-#
-# Put the compatability symlink in place.
-#
-afterinstall:
-.if !defined(IGNORE_COMPAT_SYMLINK)
-	if [ ! -e ${DOCDIR}/${COMPAT_SYMLINK} ]; then			\
-		rm -rf ${DOCDIR}/${COMPAT_SYMLINK};			\
-		(cd ${DOCDIR} && ln -s ru_RU.KOI8-R ${COMPAT_SYMLINK});	\
-	fi
-.endif
-
-.include <bsd.subdir.mk>
-
-DOC_PREFIX = ..
-.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
+DOC_PREFIX = ${.CURDIR}/..
+.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ru_RU.KOI8-R/books/Makefile b/ru_RU.KOI8-R/books/Makefile
index fbb157136d..3ad89f8470 100644
--- a/ru_RU.KOI8-R/books/Makefile
+++ b/ru_RU.KOI8-R/books/Makefile
@@ -1,5 +1,8 @@
-#       $Id: Makefile,v 1.1 1999-08-29 16:51:57 nik Exp $
+#       $Id: Makefile,v 1.2 1999-09-03 17:24:47 nik Exp $
 
 SUBDIR = faq
 
-.include <bsd.subdir.mk>
+ROOT_SYMLINKS = faq
+
+DOC_PREFIX?= ${.CURDIR}/../..
+.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/zh_TW.Big5/Makefile b/zh_TW.Big5/Makefile
index 331ec2b7c9..55df581045 100644
--- a/zh_TW.Big5/Makefile
+++ b/zh_TW.Big5/Makefile
@@ -1,21 +1,8 @@
-#       $Id: Makefile,v 1.4 1999-08-26 19:42:13 nik Exp $
+#       $Id: Makefile,v 1.5 1999-09-03 17:24:42 nik Exp $
 
 SUBDIR = books
 
 COMPAT_SYMLINK = zh
 
-#
-# Put the compatability symlink in place.
-#
-afterinstall:
-.if !defined(IGNORE_COMPAT_SYMLINK)
-	if [ ! -e ${DOCDIR}/${COMPAT_SYMLINK} ]; then			\
-		rm -rf ${DOCDIR}/${COMPAT_SYMLINK};			\
-		(cd ${DOCDIR} && ln -s zh_TW.Big5 ${COMPAT_SYMLINK});	\
-	fi
-.endif
-
-.include <bsd.subdir.mk>
-
-DOC_PREFIX = ..
-.include "../share/mk/docproj.docbook.mk"
+DOC_PREFIX = ${.CURDIR}/..
+.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/zh_TW.Big5/books/Makefile b/zh_TW.Big5/books/Makefile
index bc191a57cd..3ad89f8470 100644
--- a/zh_TW.Big5/books/Makefile
+++ b/zh_TW.Big5/books/Makefile
@@ -1,5 +1,8 @@
-#       $Id: Makefile,v 1.1 1999-08-19 03:56:48 foxfair Exp $
+#       $Id: Makefile,v 1.2 1999-09-03 17:24:47 nik Exp $
 
 SUBDIR = faq
 
-.include <bsd.subdir.mk>
+ROOT_SYMLINKS = faq
+
+DOC_PREFIX?= ${.CURDIR}/../..
+.include "${DOC_PREFIX}/share/mk/doc.project.mk"