From c97832896f849efbde964072d204b2afc6620cd1 Mon Sep 17 00:00:00 2001
From: Neil Blakey-Milner <nbm@FreeBSD.org>
Date: Thu, 28 Sep 2000 23:34:49 +0000
Subject: [PATCH] If OPENJADE is defined, use the openjade replacement tools
 like 'openjade', 'onsgmls', like 'osgmlnorm'.

---
 share/mk/doc.docbook.mk | 13 +++++++++----
 share/mk/doc.html.mk    | 14 +++++++++++---
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index f894b30fc6..f6ee061177 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -1,5 +1,5 @@
 #
-# $FreeBSD: doc/share/mk/doc.docbook.mk,v 1.17 2000/09/25 08:17:03 nik Exp $
+# $FreeBSD: doc/share/mk/doc.docbook.mk,v 1.18 2000/09/28 23:29:47 nbm Exp $
 #
 # This include file <doc.docbook.mk> handles building and installing of
 # DocBook documentation in the FreeBSD Documentation Project.
@@ -47,7 +47,13 @@
 
 MASTERDOC?=	${.CURDIR}/${DOC}.sgml
 
-JADE=		${PREFIX}/bin/jade
+.if !defined(OPENJADE)
+JADE?=		${PREFIX}/bin/jade
+JADECATALOG?=	${PREFIX}/share/sgml/jade/catalog
+.else
+JADE?=		${PREFIX}/bin/openjade
+JADECATALOG?=	${PREFIX}/share/sgml/openjade/catalog
+.endif
 
 DSLHTML?=	${DOC_PREFIX}/share/sgml/default.dsl
 DSLPRINT?=	${DOC_PREFIX}/share/sgml/default.dsl
@@ -55,7 +61,6 @@ FREEBSDCATALOG=	${DOC_PREFIX}/share/sgml/catalog
 LANGUAGECATALOG=${DOC_PREFIX}/${LANGCODE}/share/sgml/catalog
 
 DOCBOOKCATALOG=	${PREFIX}/share/sgml/docbook/catalog
-JADECATALOG=	${PREFIX}/share/sgml/jade/catalog
 DSSSLCATALOG=	${PREFIX}/share/sgml/docbook/dsssl/modular/catalog
 
 LIB_IMAGES?=
@@ -241,7 +246,7 @@ ${DOC}.tar: ${SRCS}
 #
 
 lint validate:
-	nsgmls -s -c ${FREEBSDCATALOG} -c ${DSSSLCATALOG} -c ${DOCBOOKCATALOG} -c ${JADECATALOG} ${EXTRA_CATALOGS:S/^/-c /g} ${MASTERDOC}
+	${NSGMLS} -s -c ${FREEBSDCATALOG} -c ${DSSSLCATALOG} -c ${DOCBOOKCATALOG} -c ${JADECATALOG} ${EXTRA_CATALOGS:S/^/-c /g} ${MASTERDOC}
 
 # ------------------------------------------------------------------------
 #
diff --git a/share/mk/doc.html.mk b/share/mk/doc.html.mk
index 0f6ef69d2e..93aa2549a4 100644
--- a/share/mk/doc.html.mk
+++ b/share/mk/doc.html.mk
@@ -1,5 +1,5 @@
 #
-# $FreeBSD: doc/share/mk/doc.html.mk,v 1.2 2000/07/19 01:46:48 jhb Exp $
+# $FreeBSD: doc/share/mk/doc.html.mk,v 1.3 2000/07/23 16:27:58 nik Exp $
 #
 # This include file <doc.html.mk> handles building and installing of
 # HTML documentation in the FreeBSD Documentation Project.
@@ -47,6 +47,14 @@ KNOWN_FORMATS=	html txt tar pdb
 
 HTMLCATALOG=	${PREFIX}/share/sgml/html/catalog
 
+.if !defined(OPENJADE)
+NSGMLS?=	nsgmls
+SGMLNORM?=	sgmlnorm
+.else
+NSGMLS?=	onsgmls
+SGMLNORM?=	osgmlnorm
+.endif
+
 # ------------------------------------------------------------------------
 #
 
@@ -96,7 +104,7 @@ CLEANFILES+= ${DOC}.${_curformat}.${_curcomp}
 all: ${_docs}
 
 ${DOC}.html: ${SRCS}
-	sgmlnorm -c ${HTMLCATALOG} ${.ALLSRC} > ${.TARGET}
+	${SGMLNORM} -c ${HTMLCATALOG} ${.ALLSRC} > ${.TARGET}
 .if !defined(NO_TIDY)
 	-tidy -i -m -f /dev/null ${TIDYFLAGS} ${.TARGET}
 .endif
@@ -134,7 +142,7 @@ ${DOC}.${_curformat}:
 #
 
 lint validate:
-	nsgmls -s -c ${HTMLCATALOG} ${MASTERDOC}
+	${NSGMLS} -s -c ${HTMLCATALOG} ${MASTERDOC}
 
 # ------------------------------------------------------------------------
 #