- Rework jade/openjade handling.

Before: use jade on i386, openjade on !386, provide OPENJADE var for override

  Now: detect what's available, when both systems are present, use jade,
  provide OPENJADE var for override

  This change follows same logic as recent similar change in web.mk

Approved by:	keramida (mentor)

share/mk/doc.docbook.mk

@@ -125,26 +125,22 @@ SP_ENCODING_LIST?=	ISO-8859-2 KOI8-R
 # Which stylesheet type to use.  'dsssl' or 'xsl'
 STYLESHEET_TYPE?=	dsssl
 
-.if ${MACHINE_ARCH} != "i386"
-OPENJADE=	yes
-.endif
-
 .if defined(SPELLCHECK)
 DSLHTML?= ${DOC_PREFIX}/share/sgml/spellcheck.dsl
 .endif
 
-.if defined(OPENJADE)
+.if exists(${PREFIX}/bin/jade) && !defined(OPENJADE)
-JADE?=		${PREFIX}/bin/openjade
-JADECATALOG?=	${PREFIX}/share/sgml/openjade/catalog
-NSGMLS?=	${PREFIX}/bin/onsgmls
-JADEFLAGS+=	-V openjade
-SX?=		${PREFIX}/bin/osx
-.else
 JADE?=		${PREFIX}/bin/jade
 JADECATALOG?=	${PREFIX}/share/sgml/jade/catalog
 NSGMLS?=	${PREFIX}/bin/nsgmls
 NSGMLSWARNINGS=	-wempty -wunclosed
 SX?=		${PREFIX}/bin/sx
+.else
+JADE?=		${PREFIX}/bin/openjade
+JADECATALOG?=	${PREFIX}/share/sgml/openjade/catalog
+NSGMLS?=	${PREFIX}/bin/onsgmls
+JADEFLAGS+=	-V openjade
+SX?=		${PREFIX}/bin/osx
 .endif
 
 .if defined(SP_ENCODING)

share/mk/doc.html.mk

@@ -51,16 +51,12 @@ HTMLCATALOG=	${PREFIX}/share/sgml/html/catalog
 
 IMAGES_LIB?=
 
-.if ${MACHINE_ARCH} != "i386"
+if exists(${PREFIX}/bin/sgmlnorm) && !defined(OPENJADE)
-OPENJADE=	yes
-.endif
-
-.if defined(OPENJADE)
-NSGMLS?=	${PREFIX}/bin/onsgmls
-SGMLNORM?=	${PREFIX}/bin/osgmlnorm
-.else
 NSGMLS?=	${PREFIX}/bin/nsgmls
 SGMLNORM?=	${PREFIX}/bin/sgmlnorm
+.else
+NSGMLS?=	${PREFIX}/bin/onsgmls
+SGMLNORM?=	${PREFIX}/bin/osgmlnorm
 .endif
  
 PKG_CREATE?=	/usr/sbin/pkg_create