diff options
26 files changed, 120 insertions, 65 deletions
diff --git a/release/doc/Makefile b/release/doc/Makefile index e27ee3f5d2a7..d7d905d50d36 100644 --- a/release/doc/Makefile +++ b/release/doc/Makefile @@ -9,7 +9,7 @@ SUBDIR = ${DOC_LANG} SUBDIR = en_US.ISO_8859-1 .endif -DOC_PREFIX?= /usr/doc +RELN_ROOT?= ${.CURDIR} .if defined(SUPHOST) SUPFLAGS+= -h ${SUPHOST} @@ -33,4 +33,5 @@ update: @echo "Error: Please define either SUP_UPDATE or CVS_UPDATE first." .endif +.include "${RELN_ROOT}/share/mk/doc.relnotes.mk" .include "${DOC_PREFIX}/share/mk/doc.subdir.mk" diff --git a/release/doc/en_US.ISO8859-1/Makefile b/release/doc/en_US.ISO8859-1/Makefile index 8a9a13d38032..7911dbfe2ef7 100644 --- a/release/doc/en_US.ISO8859-1/Makefile +++ b/release/doc/en_US.ISO8859-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.ISO8859-1/errata/Makefile b/release/doc/en_US.ISO8859-1/errata/Makefile index 92dda7d052d4..7ae9443537ee 100644 --- a/release/doc/en_US.ISO8859-1/errata/Makefile +++ b/release/doc/en_US.ISO8859-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.ISO8859-1/hardware/Makefile b/release/doc/en_US.ISO8859-1/hardware/Makefile index 010e10ca7012..dca83802a321 100644 --- a/release/doc/en_US.ISO8859-1/hardware/Makefile +++ b/release/doc/en_US.ISO8859-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.ISO8859-1/hardware/alpha/Makefile b/release/doc/en_US.ISO8859-1/hardware/alpha/Makefile index 32064f08fb46..7b69f8892b27 100644 --- a/release/doc/en_US.ISO8859-1/hardware/alpha/Makefile +++ b/release/doc/en_US.ISO8859-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.ISO8859-1/hardware/i386/Makefile b/release/doc/en_US.ISO8859-1/hardware/i386/Makefile index 8a3ff9ba73e8..6b396a1a3ae9 100644 --- a/release/doc/en_US.ISO8859-1/hardware/i386/Makefile +++ b/release/doc/en_US.ISO8859-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.ISO8859-1/installation/Makefile b/release/doc/en_US.ISO8859-1/installation/Makefile index 010e10ca7012..dca83802a321 100644 --- a/release/doc/en_US.ISO8859-1/installation/Makefile +++ b/release/doc/en_US.ISO8859-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.ISO8859-1/installation/alpha/Makefile b/release/doc/en_US.ISO8859-1/installation/alpha/Makefile index 5424efd0226d..5fa420f3ee4d 100644 --- a/release/doc/en_US.ISO8859-1/installation/alpha/Makefile +++ b/release/doc/en_US.ISO8859-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.ISO8859-1/installation/i386/Makefile b/release/doc/en_US.ISO8859-1/installation/i386/Makefile index d4f2e5d2b920..9f80ef82d7ef 100644 --- a/release/doc/en_US.ISO8859-1/installation/i386/Makefile +++ b/release/doc/en_US.ISO8859-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.ISO8859-1/readme/Makefile b/release/doc/en_US.ISO8859-1/readme/Makefile index 5cf475181475..adc8a2477860 100644 --- a/release/doc/en_US.ISO8859-1/readme/Makefile +++ b/release/doc/en_US.ISO8859-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.ISO8859-1/relnotes/Makefile b/release/doc/en_US.ISO8859-1/relnotes/Makefile index 010e10ca7012..dca83802a321 100644 --- a/release/doc/en_US.ISO8859-1/relnotes/Makefile +++ b/release/doc/en_US.ISO8859-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.ISO8859-1/relnotes/alpha/Makefile b/release/doc/en_US.ISO8859-1/relnotes/alpha/Makefile index d142f07ad405..29edd54939c5 100644 --- a/release/doc/en_US.ISO8859-1/relnotes/alpha/Makefile +++ b/release/doc/en_US.ISO8859-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.ISO8859-1/relnotes/i386/Makefile b/release/doc/en_US.ISO8859-1/relnotes/i386/Makefile index 4a2b4594fb9d..862e9f109ebc 100644 --- a/release/doc/en_US.ISO8859-1/relnotes/i386/Makefile +++ b/release/doc/en_US.ISO8859-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" diff --git a/release/doc/en_US.ISO_8859-1/Makefile b/release/doc/en_US.ISO_8859-1/Makefile index 8a9a13d38032..7911dbfe2ef7 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 92dda7d052d4..7ae9443537ee 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 010e10ca7012..dca83802a321 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 32064f08fb46..7b69f8892b27 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 8a3ff9ba73e8..6b396a1a3ae9 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 010e10ca7012..dca83802a321 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 5424efd0226d..5fa420f3ee4d 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 d4f2e5d2b920..9f80ef82d7ef 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 5cf475181475..adc8a2477860 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 010e10ca7012..dca83802a321 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 d142f07ad405..29edd54939c5 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 4a2b4594fb9d..862e9f109ebc 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" diff --git a/release/doc/share/mk/doc.relnotes.mk b/release/doc/share/mk/doc.relnotes.mk new file mode 100644 index 000000000000..8248441e87ec --- /dev/null +++ b/release/doc/share/mk/doc.relnotes.mk @@ -0,0 +1,6 @@ +# $FreeBSD$ + +DOC_PREFIX?= ${RELN_ROOT}/../../../doc + +# XXX using /release/doc as anchor! +DESTDIR?= ${DOCDIR}/${.CURDIR:C/^.*\/release\/doc//} |