Make the doc/en_* makefiles repect ${DOC_PREFIX} when they include

${DOC_PREFIX}/share/mk/docproj.docbook.mk instead of using hard-coded
paths.

Reviewed partially by:	nik, billf

11 files changed, 22 insertions, 22 deletions

diff --git a/en_US.ISO_8859-1/Makefile b/en_US.ISO_8859-1/Makefile
index 8754be5033..0f93fb7943 100644
--- a/en_US.ISO_8859-1/Makefile
+++ b/en_US.ISO_8859-1/Makefile
@@ -1,4 +1,4 @@
-#       $Id: Makefile,v 1.4 1999-08-26 19:42:10 nik Exp $
+#       $Id: Makefile,v 1.5 1999-08-29 00:02:11 jhb Exp $
 
 SUBDIR = articles
 SUBDIR+= books
@@ -19,4 +19,4 @@ afterinstall:
 .include <bsd.subdir.mk>
 
 DOC_PREFIX?= ..
-.include "../share/mk/docproj.docbook.mk"
+.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
diff --git a/en_US.ISO_8859-1/articles/diskless-x/Makefile b/en_US.ISO_8859-1/articles/diskless-x/Makefile
index cd54c8a457..d5f2be42d6 100644
--- a/en_US.ISO_8859-1/articles/diskless-x/Makefile
+++ b/en_US.ISO_8859-1/articles/diskless-x/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 1999-08-17 21:35:52 nik Exp $
+# $Id: Makefile,v 1.3 1999-08-29 00:02:16 jhb Exp $
 
 DOC?= article
 
@@ -11,4 +11,4 @@ SRCS= article.sgml
 
 DOC_PREFIX?= ../../..
 
-.include "../../../share/mk/docproj.docbook.mk"
+.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
diff --git a/en_US.ISO_8859-1/articles/fonts/Makefile b/en_US.ISO_8859-1/articles/fonts/Makefile
index c200f26275..d0462b8b56 100644
--- a/en_US.ISO_8859-1/articles/fonts/Makefile
+++ b/en_US.ISO_8859-1/articles/fonts/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.5 1999-08-16 22:09:06 nik Exp $
+# $Id: Makefile,v 1.6 1999-08-29 00:02:17 jhb Exp $
 
 DOC?= article
 
@@ -11,4 +11,4 @@ SRCS= article.sgml
 
 DOC_PREFIX?= ../../..
 
-.include "../../../share/mk/docproj.docbook.mk"
+.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
diff --git a/en_US.ISO_8859-1/articles/formatting-media/Makefile b/en_US.ISO_8859-1/articles/formatting-media/Makefile
index 278b834b65..dba9db4ba0 100644
--- a/en_US.ISO_8859-1/articles/formatting-media/Makefile
+++ b/en_US.ISO_8859-1/articles/formatting-media/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 1999-08-16 22:09:06 nik Exp $
+# $Id: Makefile,v 1.3 1999-08-29 00:02:17 jhb Exp $
 
 DOC?= article
 
@@ -11,4 +11,4 @@ SRCS= article.sgml
 
 DOC_PREFIX?= ../../..
 
-.include "../../../share/mk/docproj.docbook.mk"
+.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
diff --git a/en_US.ISO_8859-1/articles/mh/Makefile b/en_US.ISO_8859-1/articles/mh/Makefile
index 7e8950b8dc..f3bf40449f 100644
--- a/en_US.ISO_8859-1/articles/mh/Makefile
+++ b/en_US.ISO_8859-1/articles/mh/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.5 1999-08-16 22:09:07 nik Exp $
+# $Id: Makefile,v 1.6 1999-08-29 00:02:18 jhb Exp $
 
 DOC?= article
 
@@ -11,4 +11,4 @@ SRCS= article.sgml
 
 DOC_PREFIX?= ../../..
 
-.include "../../../share/mk/docproj.docbook.mk"
+.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
diff --git a/en_US.ISO_8859-1/articles/multi-os/Makefile b/en_US.ISO_8859-1/articles/multi-os/Makefile
index 06a8207b8c..434db56983 100644
--- a/en_US.ISO_8859-1/articles/multi-os/Makefile
+++ b/en_US.ISO_8859-1/articles/multi-os/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.5 1999-08-16 22:09:08 nik Exp $
+# $Id: Makefile,v 1.6 1999-08-29 00:02:19 jhb Exp $
 
 DOC?= article
 
@@ -11,4 +11,4 @@ SRCS= article.sgml
 
 DOC_PREFIX?= ../../..
 
-.include "../../../share/mk/docproj.docbook.mk"
+.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
diff --git a/en_US.ISO_8859-1/articles/new-users/Makefile b/en_US.ISO_8859-1/articles/new-users/Makefile
index 0d0727a6c0..1a06357bf7 100644
--- a/en_US.ISO_8859-1/articles/new-users/Makefile
+++ b/en_US.ISO_8859-1/articles/new-users/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 1999-08-16 22:09:09 nik Exp $
+# $Id: Makefile,v 1.5 1999-08-29 00:02:20 jhb Exp $
 
 DOC?= article
 
@@ -11,4 +11,4 @@ SRCS= article.sgml
 
 DOC_PREFIX?= ../../..
 
-.include "../../../share/mk/docproj.docbook.mk"
+.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
diff --git a/en_US.ISO_8859-1/articles/programming-tools/Makefile b/en_US.ISO_8859-1/articles/programming-tools/Makefile
index 3e30fdb5f9..97336ee44d 100644
--- a/en_US.ISO_8859-1/articles/programming-tools/Makefile
+++ b/en_US.ISO_8859-1/articles/programming-tools/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.5 1999-08-16 22:09:10 nik Exp $
+# $Id: Makefile,v 1.6 1999-08-29 00:02:21 jhb Exp $
 
 DOC?= article
 
@@ -11,4 +11,4 @@ SRCS= article.sgml
 
 DOC_PREFIX?= ../../..
 
-.include "../../../share/mk/docproj.docbook.mk"
+.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
diff --git a/en_US.ISO_8859-1/books/faq/Makefile b/en_US.ISO_8859-1/books/faq/Makefile
index 9c9e480cf5..cd323c256b 100644
--- a/en_US.ISO_8859-1/books/faq/Makefile
+++ b/en_US.ISO_8859-1/books/faq/Makefile
@@ -1,5 +1,5 @@
 # 
-# $Id: Makefile,v 1.2 1999-08-28 19:49:31 jhb Exp $
+# $Id: Makefile,v 1.3 1999-08-29 00:02:21 jhb Exp $
 #
 # Build the FreeBSD FAQ
 #
@@ -23,4 +23,4 @@ SRCS=  book.sgml
 
 DOC_PREFIX?= ../../..
 
-.include "../../../share/mk/docproj.docbook.mk"
+.include "$(DOC_PREFIX)/share/mk/docproj.docbook.mk"
diff --git a/en_US.ISO_8859-1/books/fdp-primer/Makefile b/en_US.ISO_8859-1/books/fdp-primer/Makefile
index 84d7515208..ec34c30d36 100644
--- a/en_US.ISO_8859-1/books/fdp-primer/Makefile
+++ b/en_US.ISO_8859-1/books/fdp-primer/Makefile
@@ -1,5 +1,5 @@
 # 
-# $Id: Makefile,v 1.4 1999-08-28 19:49:38 jhb Exp $
+# $Id: Makefile,v 1.5 1999-08-29 00:02:22 jhb Exp $
 #
 # Build the FreeBSD Documentation Project Primer.
 #
@@ -38,4 +38,4 @@ SRCS+= chapters.ent
 
 DOC_PREFIX?= ../../..
 
-.include "../../../share/mk/docproj.docbook.mk"
+.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
diff --git a/en_US.ISO_8859-1/books/handbook/Makefile b/en_US.ISO_8859-1/books/handbook/Makefile
index 4f544d0096..1fdde894a9 100644
--- a/en_US.ISO_8859-1/books/handbook/Makefile
+++ b/en_US.ISO_8859-1/books/handbook/Makefile
@@ -1,5 +1,5 @@
 # 
-# $Id: Makefile,v 1.23 1999-08-28 19:49:39 jhb Exp $
+# $Id: Makefile,v 1.24 1999-08-29 00:02:23 jhb Exp $
 #
 # Build the FreeBSD Handbook.
 #
@@ -56,4 +56,4 @@ SRCS+= chapters.ent
 SRCS+= mailing-lists.ent
 
 DOC_PREFIX?= ../../..
-.include "../../../share/mk/docproj.docbook.mk"
+.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"