Honour ${DOCDIR} when installing the documentation.

16 files changed, 77 insertions, 83 deletions

diff --git a/en_US.ISO8859-1/Makefile b/en_US.ISO8859-1/Makefile
index 8b2cf5b6de..6debd4bfa4 100644
--- a/en_US.ISO8859-1/Makefile
+++ b/en_US.ISO8859-1/Makefile
@@ -1,4 +1,4 @@
-#       $Id: Makefile,v 1.2 1999-08-16 22:09:04 nik Exp $
+#       $Id: Makefile,v 1.3 1999-08-19 20:35:53 nik Exp $
 
 SUBDIR = articles
 SUBDIR+= books
@@ -10,11 +10,14 @@ COMPAT_SYMLINK = en
 #
 afterinstall:
 .if !defined(IGNORE_COMPAT_SYMLINK)
-	if [ ! -e /usr/local/share/doc/fdp/${COMPAT_SYMLINK} ]; then	\
-		rm -rf /usr/local/share/doc/fdp/${COMPAT_SYMLINK};	\
-		ln -s /usr/local/share/doc/fdp/en_US.ISO_8859-1		\
-		      /usr/local/share/doc/fdp/${COMPAT_SYMLINK};	\
+	if [ ! -e ${DOCDIR}/${COMPAT_SYMLINK} ]; then			\
+		rm -rf ${DOCDIR}/${COMPAT_SYMLINK};			\
+		ln -s ${DOCDIR}/en_US.ISO_8859-1			\
+		      ${DOCDIR}/${COMPAT_SYMLINK};			\
 	fi
 .endif
 
 .include <bsd.subdir.mk>
+
+DOC_PREFIX?= ..
+.include "../share/mk/docproj.docbook.mk"
diff --git a/en_US.ISO8859-1/articles/Makefile.inc b/en_US.ISO8859-1/articles/Makefile.inc
index 407eab0019..1f8906fbe4 100644
--- a/en_US.ISO8859-1/articles/Makefile.inc
+++ b/en_US.ISO8859-1/articles/Makefile.inc
@@ -1,5 +1,5 @@
 # 
-# $Id: Makefile.inc,v 1.1 1999-08-16 22:09:19 nik Exp $
+# $Id: Makefile.inc,v 1.2 1999-08-19 20:35:55 nik Exp $
 #
 
-DESTDIR?=	${DOC_INSTALL_PREFIX}/en_US.ISO_8859-1/articles/${.CURDIR:T}
+DESTDIR?=	${DOCDIR}/en_US.ISO_8859-1/articles/${.CURDIR:T}
diff --git a/en_US.ISO8859-1/books/Makefile.inc b/en_US.ISO8859-1/books/Makefile.inc
index fb034c2816..a5fdc888a4 100644
--- a/en_US.ISO8859-1/books/Makefile.inc
+++ b/en_US.ISO8859-1/books/Makefile.inc
@@ -1,5 +1,5 @@
 # 
-# $Id: Makefile.inc,v 1.1 1999-08-16 22:09:05 nik Exp $
+# $Id: Makefile.inc,v 1.2 1999-08-19 20:35:56 nik Exp $
 #
 
-DESTDIR?=	${DOC_INSTALL_PREFIX}/en_US.ISO_8859-1/books/${.CURDIR:T}
+DESTDIR?=	${DOCDIR}/en_US.ISO_8859-1/books/${.CURDIR:T}
diff --git a/en_US.ISO_8859-1/Makefile b/en_US.ISO_8859-1/Makefile
index 8b2cf5b6de..6debd4bfa4 100644
--- a/en_US.ISO_8859-1/Makefile
+++ b/en_US.ISO_8859-1/Makefile
@@ -1,4 +1,4 @@
-#       $Id: Makefile,v 1.2 1999-08-16 22:09:04 nik Exp $
+#       $Id: Makefile,v 1.3 1999-08-19 20:35:53 nik Exp $
 
 SUBDIR = articles
 SUBDIR+= books
@@ -10,11 +10,14 @@ COMPAT_SYMLINK = en
 #
 afterinstall:
 .if !defined(IGNORE_COMPAT_SYMLINK)
-	if [ ! -e /usr/local/share/doc/fdp/${COMPAT_SYMLINK} ]; then	\
-		rm -rf /usr/local/share/doc/fdp/${COMPAT_SYMLINK};	\
-		ln -s /usr/local/share/doc/fdp/en_US.ISO_8859-1		\
-		      /usr/local/share/doc/fdp/${COMPAT_SYMLINK};	\
+	if [ ! -e ${DOCDIR}/${COMPAT_SYMLINK} ]; then			\
+		rm -rf ${DOCDIR}/${COMPAT_SYMLINK};			\
+		ln -s ${DOCDIR}/en_US.ISO_8859-1			\
+		      ${DOCDIR}/${COMPAT_SYMLINK};			\
 	fi
 .endif
 
 .include <bsd.subdir.mk>
+
+DOC_PREFIX?= ..
+.include "../share/mk/docproj.docbook.mk"
diff --git a/en_US.ISO_8859-1/articles/Makefile.inc b/en_US.ISO_8859-1/articles/Makefile.inc
index 407eab0019..1f8906fbe4 100644
--- a/en_US.ISO_8859-1/articles/Makefile.inc
+++ b/en_US.ISO_8859-1/articles/Makefile.inc
@@ -1,5 +1,5 @@
 # 
-# $Id: Makefile.inc,v 1.1 1999-08-16 22:09:19 nik Exp $
+# $Id: Makefile.inc,v 1.2 1999-08-19 20:35:55 nik Exp $
 #
 
-DESTDIR?=	${DOC_INSTALL_PREFIX}/en_US.ISO_8859-1/articles/${.CURDIR:T}
+DESTDIR?=	${DOCDIR}/en_US.ISO_8859-1/articles/${.CURDIR:T}
diff --git a/en_US.ISO_8859-1/books/Makefile.inc b/en_US.ISO_8859-1/books/Makefile.inc
index fb034c2816..a5fdc888a4 100644
--- a/en_US.ISO_8859-1/books/Makefile.inc
+++ b/en_US.ISO_8859-1/books/Makefile.inc
@@ -1,5 +1,5 @@
 # 
-# $Id: Makefile.inc,v 1.1 1999-08-16 22:09:05 nik Exp $
+# $Id: Makefile.inc,v 1.2 1999-08-19 20:35:56 nik Exp $
 #
 
-DESTDIR?=	${DOC_INSTALL_PREFIX}/en_US.ISO_8859-1/books/${.CURDIR:T}
+DESTDIR?=	${DOCDIR}/en_US.ISO_8859-1/books/${.CURDIR:T}
diff --git a/es_ES.ISO8859-1/Makefile b/es_ES.ISO8859-1/Makefile
index 577a1c69ae..ce65b21d12 100644
--- a/es_ES.ISO8859-1/Makefile
+++ b/es_ES.ISO8859-1/Makefile
@@ -1,26 +1,22 @@
-#       $Id: Makefile,v 1.3 1999-08-19 00:08:37 nik Exp $
+#       $Id: Makefile,v 1.4 1999-08-19 20:35:57 nik Exp $
 
 SUBDIR = books
 
 COMPAT_SYMLINK = es
 
-# 
-# XXX Kludge -- this directory probably doesn't exist yet.  Pull this out 
-# when the FAQ is DocBook'ed
-beforeinstall:
-	[ -d /usr/local/share/doc/fdp/es_ES.ISO_8859-1/books/faq ] || \
-		mkdir -p /usr/local/share/doc/fdp/es_ES.ISO_8859-1/books/faq
-
 #
 # Put the compatability symlink in place.
 #
 afterinstall:
 .if !defined(IGNORE_COMPAT_SYMLINK)
-	if [ ! -e /usr/local/share/doc/fdp/${COMPAT_SYMLINK} ]; then	\
-		rm -rf /usr/local/share/doc/fdp/${COMPAT_SYMLINK};	\
-		ln -s /usr/local/share/doc/fdp/es_ES.ISO_8859-1		\
-		      /usr/local/share/doc/fdp/${COMPAT_SYMLINK};	\
+	if [ ! -e ${DOCDIR}/${COMPAT_SYMLINK} ]; then			\
+		rm -rf ${DOCDIR}/${COMPAT_SYMLINK};			\
+		ln -s ${DOCDIR}/es_ES.ISO_8859-1 			\
+			${DOCDIR}/${COMPAT_SYMLINK}; 			\
 	fi
 .endif
 
 .include <bsd.subdir.mk>
+
+DOC_PREFIX = ..
+.include "../share/mk/docproj.docbook.mk"
diff --git a/es_ES.ISO8859-1/books/Makefile.inc b/es_ES.ISO8859-1/books/Makefile.inc
index 29588e6e7d..848bca5bde 100644
--- a/es_ES.ISO8859-1/books/Makefile.inc
+++ b/es_ES.ISO8859-1/books/Makefile.inc
@@ -1,5 +1,5 @@
 # 
-# $Id: Makefile.inc,v 1.1 1999-08-19 00:07:58 nik Exp $
+# $Id: Makefile.inc,v 1.2 1999-08-19 20:35:58 nik Exp $
 #
 
-DESTDIR?=	${DOC_INSTALL_PREFIX}/es_ES.ISO_8859-1/books/${.CURDIR:T}
+DESTDIR?=	${DOCDIR}/es_ES.ISO_8859-1/books/${.CURDIR:T}
diff --git a/es_ES.ISO_8859-1/Makefile b/es_ES.ISO_8859-1/Makefile
index 577a1c69ae..ce65b21d12 100644
--- a/es_ES.ISO_8859-1/Makefile
+++ b/es_ES.ISO_8859-1/Makefile
@@ -1,26 +1,22 @@
-#       $Id: Makefile,v 1.3 1999-08-19 00:08:37 nik Exp $
+#       $Id: Makefile,v 1.4 1999-08-19 20:35:57 nik Exp $
 
 SUBDIR = books
 
 COMPAT_SYMLINK = es
 
-# 
-# XXX Kludge -- this directory probably doesn't exist yet.  Pull this out 
-# when the FAQ is DocBook'ed
-beforeinstall:
-	[ -d /usr/local/share/doc/fdp/es_ES.ISO_8859-1/books/faq ] || \
-		mkdir -p /usr/local/share/doc/fdp/es_ES.ISO_8859-1/books/faq
-
 #
 # Put the compatability symlink in place.
 #
 afterinstall:
 .if !defined(IGNORE_COMPAT_SYMLINK)
-	if [ ! -e /usr/local/share/doc/fdp/${COMPAT_SYMLINK} ]; then	\
-		rm -rf /usr/local/share/doc/fdp/${COMPAT_SYMLINK};	\
-		ln -s /usr/local/share/doc/fdp/es_ES.ISO_8859-1		\
-		      /usr/local/share/doc/fdp/${COMPAT_SYMLINK};	\
+	if [ ! -e ${DOCDIR}/${COMPAT_SYMLINK} ]; then			\
+		rm -rf ${DOCDIR}/${COMPAT_SYMLINK};			\
+		ln -s ${DOCDIR}/es_ES.ISO_8859-1 			\
+			${DOCDIR}/${COMPAT_SYMLINK}; 			\
 	fi
 .endif
 
 .include <bsd.subdir.mk>
+
+DOC_PREFIX = ..
+.include "../share/mk/docproj.docbook.mk"
diff --git a/es_ES.ISO_8859-1/books/Makefile.inc b/es_ES.ISO_8859-1/books/Makefile.inc
index 29588e6e7d..848bca5bde 100644
--- a/es_ES.ISO_8859-1/books/Makefile.inc
+++ b/es_ES.ISO_8859-1/books/Makefile.inc
@@ -1,5 +1,5 @@
 # 
-# $Id: Makefile.inc,v 1.1 1999-08-19 00:07:58 nik Exp $
+# $Id: Makefile.inc,v 1.2 1999-08-19 20:35:58 nik Exp $
 #
 
-DESTDIR?=	${DOC_INSTALL_PREFIX}/es_ES.ISO_8859-1/books/${.CURDIR:T}
+DESTDIR?=	${DOCDIR}/es_ES.ISO_8859-1/books/${.CURDIR:T}
diff --git a/ja_JP.eucJP/Makefile b/ja_JP.eucJP/Makefile
index 5437dadead..8eb19d78ff 100644
--- a/ja_JP.eucJP/Makefile
+++ b/ja_JP.eucJP/Makefile
@@ -1,4 +1,4 @@
-#       $Id: Makefile,v 1.6 1999-08-16 22:09:11 nik Exp $
+#       $Id: Makefile,v 1.7 1999-08-19 20:35:58 nik Exp $
 
 SUBDIR = books
 SUBDIR+= man
@@ -6,21 +6,19 @@ SUBDIR+= FAQ
 
 COMPAT_SYMLINK = ja_JP.eucJP
 
-# XXX Kludge -- pull this out when the FAQ is in DocBook
-beforeinstall:
-	[ -d /usr/local/share/doc/fdp/ja/books/faq ] || \
-		mkdir -p /usr/local/share/doc/fdp/ja/books/faq
-
 #
 # Put the compatability symlink in place.
 #
 afterinstall:
 .if !defined(IGNORE_COMPAT_SYMLINK)
-	if [ ! -e /usr/local/share/doc/fdp/${COMPAT_SYMLINK} ]; then	\
-		rm -rf /usr/local/share/doc/fdp/${COMPAT_SYMLINK};	\
-		ln -s /usr/local/share/doc/fdp/ja			\
-		      /usr/local/share/doc/fdp/${COMPAT_SYMLINK};	\
+	if [ ! -e ${DOCDIR}/${COMPAT_SYMLINK} ]; then			\
+		rm -rf ${DOCDIR}/${COMPAT_SYMLINK};			\
+		ln -s ${DOCDIR}/ja					\
+		      ${DOCDIR}/${COMPAT_SYMLINK};			\
 	fi
 .endif
 
 .include <bsd.subdir.mk>
+
+DOC_PREFIX = ..
+.include "../share/mk/docproj.docbook.mk"
diff --git a/ja_JP.eucJP/books/Makefile.inc b/ja_JP.eucJP/books/Makefile.inc
index 565d6cd183..6a6d3e89af 100644
--- a/ja_JP.eucJP/books/Makefile.inc
+++ b/ja_JP.eucJP/books/Makefile.inc
@@ -1,5 +1,5 @@
 # 
-# $Id: Makefile.inc,v 1.1 1999-08-16 22:09:20 nik Exp $
+# $Id: Makefile.inc,v 1.2 1999-08-19 20:35:59 nik Exp $
 #
 
-DESTDIR?=	${DOC_INSTALL_PREFIX}/ja/books/${.CURDIR:T}
+DESTDIR?=	${DOCDIR}/ja/books/${.CURDIR:T}
diff --git a/ru_RU.KOI8-R/FAQ/Makefile b/ru_RU.KOI8-R/FAQ/Makefile
index ac6845defc..47b6e6a1f3 100644
--- a/ru_RU.KOI8-R/FAQ/Makefile
+++ b/ru_RU.KOI8-R/FAQ/Makefile
@@ -1,10 +1,9 @@
-# $Id: Makefile,v 1.3 1999-08-16 22:09:17 nik Exp $
+# $Id: Makefile,v 1.4 1999-08-19 20:36:01 nik Exp $
 
 .NOTPARALLEL:
 
 DOC=	FAQ
-VOLUME=	faq
-DOCDIR=	/usr/local/share/doc/fdp/ru_SU.KOI8-R/books
+DESTDIR=	${DOCDIR}/ru_RU.KOI8-R
 FORMATS?= html roff
 SGMLOPTS+=-e koi8-r
 SGMLOPTS+=-links
diff --git a/ru_RU.KOI8-R/Makefile b/ru_RU.KOI8-R/Makefile
index 08d963c3b0..24ce20f2ba 100644
--- a/ru_RU.KOI8-R/Makefile
+++ b/ru_RU.KOI8-R/Makefile
@@ -1,4 +1,4 @@
-#       $Id: Makefile,v 1.2 1999-08-16 22:09:16 nik Exp $
+#       $Id: Makefile,v 1.3 1999-08-19 20:36:00 nik Exp $
 
 SUBDIR = FAQ
 
@@ -8,19 +8,22 @@ COMPAT_SYMLINK = ru
 # XXX Kludge -- this directory probably doesn't exist yet.  Pull this out 
 # when the FAQ is DocBook'ed
 beforeinstall:
-	[ -d /usr/local/share/doc/fdp/ru_SU.KOI8-R/books/faq ] || \
-		mkdir -p /usr/local/share/doc/fdp/ru_SU.KOI8-R/books/faq
+	[ -d ${DOCDIR}/ru_SU.KOI8-R/books/faq ] || 			\
+		mkdir -p ${DOCDIR}/ru_SU.KOI8-R/books/faq
 
 #
 # Put the compatability symlink in place.
 #
 afterinstall:
 .if !defined(IGNORE_COMPAT_SYMLINK)
-	if [ ! -e /usr/local/share/doc/fdp/${COMPAT_SYMLINK} ]; then	\
-		rm -rf /usr/local/share/doc/fdp/${COMPAT_SYMLINK};	\
-		ln -s /usr/local/share/doc/fdp/ru_SU.KOI8-R	\
-		      /usr/local/share/doc/fdp/${COMPAT_SYMLINK};	\
+	if [ ! -e ${DOCDIR}/${COMPAT_SYMLINK} ]; then			\
+		rm -rf ${DOCDIR}/${COMPAT_SYMLINK};			\
+		ln -s ${DOCDIR}/ru_SU.KOI8-R				\
+		      ${DOCDIR}/${COMPAT_SYMLINK};			\
 	fi
 .endif
 
 .include <bsd.subdir.mk>
+
+DOC_PREFIX = ..
+.include "../share/mk/docproj.docbook.mk"
diff --git a/zh_TW.Big5/Makefile b/zh_TW.Big5/Makefile
index 3218690f1f..1874aba5e0 100644
--- a/zh_TW.Big5/Makefile
+++ b/zh_TW.Big5/Makefile
@@ -1,26 +1,22 @@
-#       $Id: Makefile,v 1.2 1999-08-17 21:35:56 nik Exp $
+#       $Id: Makefile,v 1.3 1999-08-19 20:36:02 nik Exp $
 
-SUBDIR = FAQ
+SUBDIR = books
 
 COMPAT_SYMLINK = zh
 
-# 
-# XXX Kludge -- this directory probably doesn't exist yet.  Pull this out 
-# when the FAQ is DocBook'ed
-beforeinstall:
-	[ -d /usr/local/share/doc/fdp/zh_TW.Big5/books/faq ] || \
-		mkdir -p /usr/local/share/doc/fdp/zh_TW.Big5/books/faq
-
 #
 # Put the compatability symlink in place.
 #
 afterinstall:
 .if !defined(IGNORE_COMPAT_SYMLINK)
-	if [ ! -e /usr/local/share/doc/fdp/${COMPAT_SYMLINK} ]; then	\
-		rm -rf /usr/local/share/doc/fdp/${COMPAT_SYMLINK};	\
-		ln -s /usr/local/share/doc/fdp/zh_TW.Big5		\
-		      /usr/local/share/doc/fdp/${COMPAT_SYMLINK};	\
+	if [ ! -e ${DOCDIR}/${COMPAT_SYMLINK} ]; then			\
+		rm -rf ${DOCDIR}/${COMPAT_SYMLINK};			\
+		ln -s ${DOCDIR}/zh_TW.Big5				\
+		      ${DOCDIR}/${COMPAT_SYMLINK};			\
 	fi
 .endif
 
 .include <bsd.subdir.mk>
+
+DOC_PREFIX = ..
+.include "../share/mk/docproj.docbook.mk"
diff --git a/zh_TW.Big5/books/Makefile.inc b/zh_TW.Big5/books/Makefile.inc
index 9fe4ab6e42..4afd82d579 100644
--- a/zh_TW.Big5/books/Makefile.inc
+++ b/zh_TW.Big5/books/Makefile.inc
@@ -1,5 +1,5 @@
 # 
-# $Id: Makefile.inc,v 1.1 1999-08-19 03:56:49 foxfair Exp $
+# $Id: Makefile.inc,v 1.2 1999-08-19 20:36:02 nik Exp $
 #
 
-DESTDIR?=	${DOC_INSTALL_PREFIX}/zh_TW.Big5/books/${.CURDIR:T}
+DESTDIR?=	${DOCDIR}/zh_TW.Big5/books/${.CURDIR:T}