Build system:

o Define a RELN_ROOT variable which points to the root of the relnotes
  tree (i.e., src/release/doc).
o By default, define DOC_PREFIX in terms of RELN_ROOT; this gives a
  bigger chance of finding the doc/ tree without help in the form of
  setting DOC_PREFIX on the command line.
o Respect DOCDIR; `make install` works now.

Approved by:	bmah

12 files changed, 56 insertions, 32 deletions

diff --git a/release/doc/en_US.ISO_8859-1/Makefile b/release/doc/en_US.ISO_8859-1/Makefile
index 8a9a13d..7911dbf 100644
--- a/release/doc/en_US.ISO_8859-1/Makefile
+++ b/release/doc/en_US.ISO_8859-1/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+RELN_ROOT?= ${.CURDIR}/..
+
 SUBDIR = relnotes
 SUBDIR+= hardware
 SUBDIR+= readme
@@ -8,5 +10,5 @@ SUBDIR+= installation
 
 COMPAT_SYMLINK = en
 
-DOC_PREFIX?= /usr/doc
+.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/en_US.ISO_8859-1/errata/Makefile b/release/doc/en_US.ISO_8859-1/errata/Makefile
index 92dda7d..7ae9443 100644
--- a/release/doc/en_US.ISO_8859-1/errata/Makefile
+++ b/release/doc/en_US.ISO_8859-1/errata/Makefile
@@ -1,13 +1,15 @@
 # $FreeBSD$
 
+RELN_ROOT?= ${.CURDIR}/../..
+
 DOC?= article
 FORMATS?= html
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
-EXTRA_CATALOGS+= ../../share/sgml/catalog
+EXTRA_CATALOGS+= ${RELN_ROOT}/share/sgml/catalog
 
 # SGML content
 SRCS+=	article.sgml
 
-DOC_PREFIX?= /usr/doc
+.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/en_US.ISO_8859-1/hardware/Makefile b/release/doc/en_US.ISO_8859-1/hardware/Makefile
index 010e10c..dca8380 100644
--- a/release/doc/en_US.ISO_8859-1/hardware/Makefile
+++ b/release/doc/en_US.ISO_8859-1/hardware/Makefile
@@ -1,7 +1,9 @@
 # $FreeBSD$
 
+RELN_ROOT?= ${.CURDIR}/../..
+
 SUBDIR = alpha
 SUBDIR+= i386
 
-DOC_PREFIX?= /usr/doc
+.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/en_US.ISO_8859-1/hardware/alpha/Makefile b/release/doc/en_US.ISO_8859-1/hardware/alpha/Makefile
index 32064f0..7b69f88 100644
--- a/release/doc/en_US.ISO_8859-1/hardware/alpha/Makefile
+++ b/release/doc/en_US.ISO_8859-1/hardware/alpha/Makefile
@@ -1,10 +1,12 @@
 # $FreeBSD$
 
+RELN_ROOT?= ${.CURDIR}/../../..
+
 DOC?= article
 FORMATS?= html
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
-EXTRA_CATALOGS+= ../../../share/sgml/catalog
+EXTRA_CATALOGS+= ${RELN_ROOT}/share/sgml/catalog
 
 # SGML content
 SRCS+=	article.sgml
@@ -15,8 +17,8 @@ SRCS+=	../common/dev.sgml
 SRCS+=	../common/config.sgml
 
 # Use the appropriate architecture-dependent RELNOTESng stylesheet
-DSLHTML?=	${.CURDIR}/../../../share/sgml/release-alpha.dsl
-DSLPRINT?=	${.CURDIR}/../../../share/sgml/release-alpha.dsl
+DSLHTML?=	${RELN_ROOT}/share/sgml/release-alpha.dsl
+DSLPRINT?=	${RELN_ROOT}/share/sgml/release-alpha.dsl
 
-DOC_PREFIX?= /usr/doc
+.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/en_US.ISO_8859-1/hardware/i386/Makefile b/release/doc/en_US.ISO_8859-1/hardware/i386/Makefile
index 8a3ff9b..6b396a1 100644
--- a/release/doc/en_US.ISO_8859-1/hardware/i386/Makefile
+++ b/release/doc/en_US.ISO_8859-1/hardware/i386/Makefile
@@ -1,10 +1,12 @@
 # $FreeBSD$
 
+RELN_ROOT?= ${.CURDIR}/../../..
+
 DOC?= article
 FORMATS?= html
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
-EXTRA_CATALOGS+= ../../../share/sgml/catalog
+EXTRA_CATALOGS+= ${RELN_ROOT}/share/sgml/catalog
 
 # SGML content
 SRCS+=	article.sgml 
@@ -15,8 +17,8 @@ SRCS+=	../common/dev.sgml
 SRCS+=	../common/config.sgml
 
 # Use the appropriate architecture-dependent RELNOTESng stylesheet
-DSLHTML?=	${.CURDIR}/../../../share/sgml/release-i386.dsl
-DSLPRINT?=	${.CURDIR}/../../../share/sgml/release-i386.dsl
+DSLHTML?=	${RELN_ROOT}/share/sgml/release-i386.dsl
+DSLPRINT?=	${RELN_ROOT}/share/sgml/release-i386.dsl
 
-DOC_PREFIX?= /usr/doc
+.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/en_US.ISO_8859-1/installation/Makefile b/release/doc/en_US.ISO_8859-1/installation/Makefile
index 010e10c..dca8380 100644
--- a/release/doc/en_US.ISO_8859-1/installation/Makefile
+++ b/release/doc/en_US.ISO_8859-1/installation/Makefile
@@ -1,7 +1,9 @@
 # $FreeBSD$
 
+RELN_ROOT?= ${.CURDIR}/../..
+
 SUBDIR = alpha
 SUBDIR+= i386
 
-DOC_PREFIX?= /usr/doc
+.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/en_US.ISO_8859-1/installation/alpha/Makefile b/release/doc/en_US.ISO_8859-1/installation/alpha/Makefile
index 5424efd..5fa420f 100644
--- a/release/doc/en_US.ISO_8859-1/installation/alpha/Makefile
+++ b/release/doc/en_US.ISO_8859-1/installation/alpha/Makefile
@@ -1,10 +1,12 @@
 # $FreeBSD$
 
+RELN_ROOT?= ${.CURDIR}/../../..
+
 DOC?= article
 FORMATS?= html
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
-EXTRA_CATALOGS+= ../../../share/sgml/catalog
+EXTRA_CATALOGS+= ${RELN_ROOT}/share/sgml/catalog
 
 # SGML content
 SRCS+=	article.sgml
@@ -16,8 +18,8 @@ SRCS+=	../common/trouble.sgml
 SRCS+=	../common/upgrade.sgml
 
 # Use the appropriate architecture-dependent RELNOTESng stylesheet
-DSLHTML?=	${.CURDIR}/../../../share/sgml/release-alpha.dsl
-DSLPRINT?=	${.CURDIR}/../../../share/sgml/release-alpha.dsl
+DSLHTML?=	${RELN_ROOT}/share/sgml/release-alpha.dsl
+DSLPRINT?=	${RELN_ROOT}/share/sgml/release-alpha.dsl
 
-DOC_PREFIX?= /usr/doc
+.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/en_US.ISO_8859-1/installation/i386/Makefile b/release/doc/en_US.ISO_8859-1/installation/i386/Makefile
index d4f2e5d..9f80ef8 100644
--- a/release/doc/en_US.ISO_8859-1/installation/i386/Makefile
+++ b/release/doc/en_US.ISO_8859-1/installation/i386/Makefile
@@ -1,10 +1,12 @@
 # $FreeBSD$
 
+RELN_ROOT?= ${.CURDIR}/../../..
+
 DOC?= article
 FORMATS?= html
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
-EXTRA_CATALOGS+= ../../../share/sgml/catalog
+EXTRA_CATALOGS+= ${RELN_ROOT}/share/sgml/catalog
 
 # SGML content
 SRCS+=	article.sgml
@@ -16,8 +18,8 @@ SRCS+=	../common/trouble.sgml
 SRCS+=	../common/upgrade.sgml
 
 # Use the appropriate architecture-dependent RELNOTESng stylesheet
-DSLHTML?=	${.CURDIR}/../../../share/sgml/release-i386.dsl
-DSLPRINT?=	${.CURDIR}/../../../share/sgml/release-i386.dsl
+DSLHTML?=	${RELN_ROOT}/share/sgml/release-i386.dsl
+DSLPRINT?=	${RELN_ROOT}/share/sgml/release-i386.dsl
 
-DOC_PREFIX?= /usr/doc
+.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/en_US.ISO_8859-1/readme/Makefile b/release/doc/en_US.ISO_8859-1/readme/Makefile
index 5cf4751..adc8a247 100644
--- a/release/doc/en_US.ISO_8859-1/readme/Makefile
+++ b/release/doc/en_US.ISO_8859-1/readme/Makefile
@@ -1,10 +1,12 @@
 # $FreeBSD$
 
+RELN_ROOT?= ${.CURDIR}/../..
+
 DOC?= article
 FORMATS?= html
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
-EXTRA_CATALOGS+= ../../share/sgml/catalog
+EXTRA_CATALOGS+= ${RELN_ROOT}/share/sgml/catalog
 
 # 
 # SRCS lists the individual SGML files that make up the document. Changes
@@ -20,5 +22,5 @@ SRCS+=	obtaining.sgml
 SRCS+=	problems.sgml
 SRCS+=	ack.sgml
 
-DOC_PREFIX?= /usr/doc
+.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/en_US.ISO_8859-1/relnotes/Makefile b/release/doc/en_US.ISO_8859-1/relnotes/Makefile
index 010e10c..dca8380 100644
--- a/release/doc/en_US.ISO_8859-1/relnotes/Makefile
+++ b/release/doc/en_US.ISO_8859-1/relnotes/Makefile
@@ -1,7 +1,9 @@
 # $FreeBSD$
 
+RELN_ROOT?= ${.CURDIR}/../..
+
 SUBDIR = alpha
 SUBDIR+= i386
 
-DOC_PREFIX?= /usr/doc
+.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/en_US.ISO_8859-1/relnotes/alpha/Makefile b/release/doc/en_US.ISO_8859-1/relnotes/alpha/Makefile
index d142f07..29edd54 100644
--- a/release/doc/en_US.ISO_8859-1/relnotes/alpha/Makefile
+++ b/release/doc/en_US.ISO_8859-1/relnotes/alpha/Makefile
@@ -1,10 +1,12 @@
 # $FreeBSD$
 
+RELN_ROOT?= ${.CURDIR}/../../..
+
 DOC?= article
 FORMATS?= html
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
-EXTRA_CATALOGS+= ../../../share/sgml/catalog
+EXTRA_CATALOGS+= ${RELN_ROOT}/share/sgml/catalog
 
 # SGML content
 SRCS+=	article.sgml
@@ -14,8 +16,8 @@ SRCS+=	../common/new.sgml
 SRCS+=	../common/upgrading.sgml
 
 # Use the appropriate architecture-dependent RELNOTESng stylesheet
-DSLHTML?=	${.CURDIR}/../../../share/sgml/release-alpha.dsl
-DSLPRINT?=	${.CURDIR}/../../../share/sgml/release-alpha.dsl
+DSLHTML?=	${RELN_ROOT}/share/sgml/release-alpha.dsl
+DSLPRINT?=	${RELN_ROOT}/share/sgml/release-alpha.dsl
 
-DOC_PREFIX?= /usr/doc
+.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/en_US.ISO_8859-1/relnotes/i386/Makefile b/release/doc/en_US.ISO_8859-1/relnotes/i386/Makefile
index 4a2b459..862e9f1 100644
--- a/release/doc/en_US.ISO_8859-1/relnotes/i386/Makefile
+++ b/release/doc/en_US.ISO_8859-1/relnotes/i386/Makefile
@@ -1,10 +1,12 @@
 # $FreeBSD$
 
+RELN_ROOT?= ${.CURDIR}/../../..
+
 DOC?= article
 FORMATS?= html
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
-EXTRA_CATALOGS+= ../../../share/sgml/catalog
+EXTRA_CATALOGS+= ${RELN_ROOT}/share/sgml/catalog
 
 # SGML content
 SRCS+=	article.sgml
@@ -14,8 +16,8 @@ SRCS+=	../common/new.sgml
 SRCS+=	../common/upgrading.sgml
 
 # Use the appropriate architecture-dependent RELNOTESng stylesheet
-DSLHTML?=	${.CURDIR}/../../../share/sgml/release-i386.dsl
-DSLPRINT?=	${.CURDIR}/../../../share/sgml/release-i386.dsl
+DSLHTML?=	${RELN_ROOT}/share/sgml/release-i386.dsl
+DSLPRINT?=	${RELN_ROOT}/share/sgml/release-i386.dsl
 
-DOC_PREFIX?= /usr/doc
+.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"