Date: Tue, 20 Mar 2001 08:48:50 -0800 From: "David O'Brien" <obrien@freebsd.org> To: doc@freebsd.org Subject: Re: OpenJade support isn't complete Message-ID: <20010320084850.A28093@dragon.nuxi.com> In-Reply-To: <20010319204933.A74557@dragon.nuxi.com>; from obrien@FreeBSD.org on Mon, Mar 19, 2001 at 08:49:33PM -0800 References: <20010319204933.A74557@dragon.nuxi.com>
next in thread | previous in thread | raw e-mail | index | archive | help
`doc.html.mk' did does not do any checks for the Alpha.
This patch does that. It also changes the negative logic to match
doc.docbook.mk. I changed doc.docbook.mk to actually set the "OPENJADE"
symbol, so other Makefiles can test it if they need to.
Index: doc.docbook.mk
===================================================================
RCS file: /home/ncvs/doc/share/mk/doc.docbook.mk,v
retrieving revision 1.29
diff -u -r1.29 doc.docbook.mk
--- doc.docbook.mk 2001/03/18 15:48:10 1.29
+++ doc.docbook.mk 2001/03/20 16:44:44
@@ -53,7 +53,11 @@
MASTERDOC?= ${.CURDIR}/${DOC}.${DOCBOOKSUFFIX}
-.if defined(OPENJADE) || ${MACHINE_ARCH} == "alpha"
+.if ${MACHINE_ARCH} == "alpha"
+OPENJADE= yes
+.endif
+
+.if defined(OPENJADE)
JADE?= ${PREFIX}/bin/openjade
JADECATALOG?= ${PREFIX}/share/sgml/openjade/catalog
NSGMLS?= ${PREFIX}/bin/onsgmls
Index: doc.html.mk
===================================================================
RCS file: /home/ncvs/doc/share/mk/doc.html.mk,v
retrieving revision 1.6
diff -u -r1.6 doc.html.mk
--- doc.html.mk 2001/03/13 18:29:06 1.6
+++ doc.html.mk 2001/03/20 16:44:30
@@ -47,12 +47,16 @@
HTMLCATALOG= ${PREFIX}/share/sgml/html/catalog
-.if !defined(OPENJADE)
-NSGMLS?= nsgmls
-SGMLNORM?= sgmlnorm
-.else
+.if ${MACHINE_ARCH} == "alpha"
+OPENJADE= yes
+.endif
+
+.if defined(OPENJADE)
NSGMLS?= onsgmls
SGMLNORM?= osgmlnorm
+.else
+NSGMLS?= nsgmls
+SGMLNORM?= sgmlnorm
.endif
# ------------------------------------------------------------------------
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-doc" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010320084850.A28093>