From owner-freebsd-doc  Tue Mar 20  8:48:54 2001
Delivered-To: freebsd-doc@freebsd.org
Received: from dragon.nuxi.com (trang.nuxi.com [209.152.133.57])
	by hub.freebsd.org (Postfix) with ESMTP id 55E7F37B71C
	for <doc@freebsd.org>; Tue, 20 Mar 2001 08:48:51 -0800 (PST)
	(envelope-from obrien@NUXI.com)
Received: (from obrien@localhost)
	by dragon.nuxi.com (8.11.3/8.11.1) id f2KGmof28109
	for doc@freebsd.org; Tue, 20 Mar 2001 08:48:50 -0800 (PST)
	(envelope-from obrien)
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>
Reply-To: obrien@freebsd.org
References: <20010319204933.A74557@dragon.nuxi.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.2.5i
In-Reply-To: <20010319204933.A74557@dragon.nuxi.com>; from obrien@FreeBSD.org on Mon, Mar 19, 2001 at 08:49:33PM -0800
X-Operating-System: FreeBSD 5.0-CURRENT
Organization: The NUXI BSD group
X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3  90 76 5D 69 58 D9 98 7A
X-Pgp-Rsa-Keyid: 1024/34F9F9D5
Sender: owner-freebsd-doc@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org

`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