diff --git a/en_US.ISO8859-1/articles/diskless-x/Makefile b/en_US.ISO8859-1/articles/diskless-x/Makefile
index d5f2be42d6..9393182f54 100644
--- a/en_US.ISO8859-1/articles/diskless-x/Makefile
+++ b/en_US.ISO8859-1/articles/diskless-x/Makefile
@@ -1,14 +1,14 @@
-# $Id: Makefile,v 1.3 1999-08-29 00:02:16 jhb Exp $
+# $Id: Makefile,v 1.4 1999-09-03 17:40:08 nik Exp $
 
 DOC?= article
 
 FORMATS?= html
 
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
 SRCS= article.sgml
 
-DOC_PREFIX?= ../../..
+DOC_PREFIX?= ${.CURDIR}/../../..
 
-.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
+.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/fonts/Makefile b/en_US.ISO8859-1/articles/fonts/Makefile
index d0462b8b56..9f4efb2782 100644
--- a/en_US.ISO8859-1/articles/fonts/Makefile
+++ b/en_US.ISO8859-1/articles/fonts/Makefile
@@ -1,14 +1,14 @@
-# $Id: Makefile,v 1.6 1999-08-29 00:02:17 jhb Exp $
+# $Id: Makefile,v 1.7 1999-09-03 17:40:09 nik Exp $
 
 DOC?= article
 
 FORMATS?= html
 
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
 SRCS= article.sgml
 
-DOC_PREFIX?= ../../..
+DOC_PREFIX?= ${.CURDIR}/../../..
 
-.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
+.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/formatting-media/Makefile b/en_US.ISO8859-1/articles/formatting-media/Makefile
index dba9db4ba0..58c6634af5 100644
--- a/en_US.ISO8859-1/articles/formatting-media/Makefile
+++ b/en_US.ISO8859-1/articles/formatting-media/Makefile
@@ -1,14 +1,14 @@
-# $Id: Makefile,v 1.3 1999-08-29 00:02:17 jhb Exp $
+# $Id: Makefile,v 1.4 1999-09-03 17:40:10 nik Exp $
 
 DOC?= article
 
 FORMATS?= html
 
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
 SRCS= article.sgml
 
-DOC_PREFIX?= ../../..
+DOC_PREFIX?= ${.CURDIR}/../../..
 
-.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
+.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/mh/Makefile b/en_US.ISO8859-1/articles/mh/Makefile
index f3bf40449f..fddad4fae9 100644
--- a/en_US.ISO8859-1/articles/mh/Makefile
+++ b/en_US.ISO8859-1/articles/mh/Makefile
@@ -1,14 +1,14 @@
-# $Id: Makefile,v 1.6 1999-08-29 00:02:18 jhb Exp $
+# $Id: Makefile,v 1.7 1999-09-03 17:40:11 nik Exp $
 
 DOC?= article
 
 FORMATS?= html
 
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
 SRCS= article.sgml
 
-DOC_PREFIX?= ../../..
+DOC_PREFIX?= ${.CURDIR}/../../..
 
-.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
+.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/multi-os/Makefile b/en_US.ISO8859-1/articles/multi-os/Makefile
index 434db56983..fddad4fae9 100644
--- a/en_US.ISO8859-1/articles/multi-os/Makefile
+++ b/en_US.ISO8859-1/articles/multi-os/Makefile
@@ -1,14 +1,14 @@
-# $Id: Makefile,v 1.6 1999-08-29 00:02:19 jhb Exp $
+# $Id: Makefile,v 1.7 1999-09-03 17:40:11 nik Exp $
 
 DOC?= article
 
 FORMATS?= html
 
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
 SRCS= article.sgml
 
-DOC_PREFIX?= ../../..
+DOC_PREFIX?= ${.CURDIR}/../../..
 
-.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
+.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/new-users/Makefile b/en_US.ISO8859-1/articles/new-users/Makefile
index 1a06357bf7..50763053a2 100644
--- a/en_US.ISO8859-1/articles/new-users/Makefile
+++ b/en_US.ISO8859-1/articles/new-users/Makefile
@@ -1,14 +1,14 @@
-# $Id: Makefile,v 1.5 1999-08-29 00:02:20 jhb Exp $
+# $Id: Makefile,v 1.6 1999-09-03 17:40:12 nik Exp $
 
 DOC?= article
 
 FORMATS?= html
 
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
 SRCS= article.sgml
 
-DOC_PREFIX?= ../../..
+DOC_PREFIX?= ${.CURDIR}/../../..
 
-.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
+.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/programming-tools/Makefile b/en_US.ISO8859-1/articles/programming-tools/Makefile
index 97336ee44d..bd622390ee 100644
--- a/en_US.ISO8859-1/articles/programming-tools/Makefile
+++ b/en_US.ISO8859-1/articles/programming-tools/Makefile
@@ -1,14 +1,14 @@
-# $Id: Makefile,v 1.6 1999-08-29 00:02:21 jhb Exp $
+# $Id: Makefile,v 1.7 1999-09-03 17:40:13 nik Exp $
 
 DOC?= article
 
 FORMATS?= html
 
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
 SRCS= article.sgml
 
-DOC_PREFIX?= ../../..
+DOC_PREFIX?= ${.CURDIR}/../../..
 
-.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
+.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO_8859-1/articles/diskless-x/Makefile b/en_US.ISO_8859-1/articles/diskless-x/Makefile
index d5f2be42d6..9393182f54 100644
--- a/en_US.ISO_8859-1/articles/diskless-x/Makefile
+++ b/en_US.ISO_8859-1/articles/diskless-x/Makefile
@@ -1,14 +1,14 @@
-# $Id: Makefile,v 1.3 1999-08-29 00:02:16 jhb Exp $
+# $Id: Makefile,v 1.4 1999-09-03 17:40:08 nik Exp $
 
 DOC?= article
 
 FORMATS?= html
 
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
 SRCS= article.sgml
 
-DOC_PREFIX?= ../../..
+DOC_PREFIX?= ${.CURDIR}/../../..
 
-.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
+.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO_8859-1/articles/fonts/Makefile b/en_US.ISO_8859-1/articles/fonts/Makefile
index d0462b8b56..9f4efb2782 100644
--- a/en_US.ISO_8859-1/articles/fonts/Makefile
+++ b/en_US.ISO_8859-1/articles/fonts/Makefile
@@ -1,14 +1,14 @@
-# $Id: Makefile,v 1.6 1999-08-29 00:02:17 jhb Exp $
+# $Id: Makefile,v 1.7 1999-09-03 17:40:09 nik Exp $
 
 DOC?= article
 
 FORMATS?= html
 
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
 SRCS= article.sgml
 
-DOC_PREFIX?= ../../..
+DOC_PREFIX?= ${.CURDIR}/../../..
 
-.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
+.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO_8859-1/articles/formatting-media/Makefile b/en_US.ISO_8859-1/articles/formatting-media/Makefile
index dba9db4ba0..58c6634af5 100644
--- a/en_US.ISO_8859-1/articles/formatting-media/Makefile
+++ b/en_US.ISO_8859-1/articles/formatting-media/Makefile
@@ -1,14 +1,14 @@
-# $Id: Makefile,v 1.3 1999-08-29 00:02:17 jhb Exp $
+# $Id: Makefile,v 1.4 1999-09-03 17:40:10 nik Exp $
 
 DOC?= article
 
 FORMATS?= html
 
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
 SRCS= article.sgml
 
-DOC_PREFIX?= ../../..
+DOC_PREFIX?= ${.CURDIR}/../../..
 
-.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
+.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO_8859-1/articles/mh/Makefile b/en_US.ISO_8859-1/articles/mh/Makefile
index f3bf40449f..fddad4fae9 100644
--- a/en_US.ISO_8859-1/articles/mh/Makefile
+++ b/en_US.ISO_8859-1/articles/mh/Makefile
@@ -1,14 +1,14 @@
-# $Id: Makefile,v 1.6 1999-08-29 00:02:18 jhb Exp $
+# $Id: Makefile,v 1.7 1999-09-03 17:40:11 nik Exp $
 
 DOC?= article
 
 FORMATS?= html
 
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
 SRCS= article.sgml
 
-DOC_PREFIX?= ../../..
+DOC_PREFIX?= ${.CURDIR}/../../..
 
-.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
+.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO_8859-1/articles/multi-os/Makefile b/en_US.ISO_8859-1/articles/multi-os/Makefile
index 434db56983..fddad4fae9 100644
--- a/en_US.ISO_8859-1/articles/multi-os/Makefile
+++ b/en_US.ISO_8859-1/articles/multi-os/Makefile
@@ -1,14 +1,14 @@
-# $Id: Makefile,v 1.6 1999-08-29 00:02:19 jhb Exp $
+# $Id: Makefile,v 1.7 1999-09-03 17:40:11 nik Exp $
 
 DOC?= article
 
 FORMATS?= html
 
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
 SRCS= article.sgml
 
-DOC_PREFIX?= ../../..
+DOC_PREFIX?= ${.CURDIR}/../../..
 
-.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
+.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO_8859-1/articles/new-users/Makefile b/en_US.ISO_8859-1/articles/new-users/Makefile
index 1a06357bf7..50763053a2 100644
--- a/en_US.ISO_8859-1/articles/new-users/Makefile
+++ b/en_US.ISO_8859-1/articles/new-users/Makefile
@@ -1,14 +1,14 @@
-# $Id: Makefile,v 1.5 1999-08-29 00:02:20 jhb Exp $
+# $Id: Makefile,v 1.6 1999-09-03 17:40:12 nik Exp $
 
 DOC?= article
 
 FORMATS?= html
 
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
 SRCS= article.sgml
 
-DOC_PREFIX?= ../../..
+DOC_PREFIX?= ${.CURDIR}/../../..
 
-.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
+.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO_8859-1/articles/programming-tools/Makefile b/en_US.ISO_8859-1/articles/programming-tools/Makefile
index 97336ee44d..bd622390ee 100644
--- a/en_US.ISO_8859-1/articles/programming-tools/Makefile
+++ b/en_US.ISO_8859-1/articles/programming-tools/Makefile
@@ -1,14 +1,14 @@
-# $Id: Makefile,v 1.6 1999-08-29 00:02:21 jhb Exp $
+# $Id: Makefile,v 1.7 1999-09-03 17:40:13 nik Exp $
 
 DOC?= article
 
 FORMATS?= html
 
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
 SRCS= article.sgml
 
-DOC_PREFIX?= ../../..
+DOC_PREFIX?= ${.CURDIR}/../../..
 
-.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
+.include "${DOC_PREFIX}/share/mk/doc.project.mk"