From 022732cd52ef599712aaa8fa2d2804a44c14e46d Mon Sep 17 00:00:00 2001
From: Pav Lucistnik <pav@FreeBSD.org>
Date: Tue, 30 Aug 2005 11:50:05 +0000
Subject: [PATCH] - Refine previous commit: restore preference of jade over
 openjade when   both are present, provide OPENJADE var for overriding

Requested by:	ceri
Approved by:	keramida (mentor)
---
 share/mk/web.site.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/share/mk/web.site.mk b/share/mk/web.site.mk
index 13102b4627..7c700062d8 100644
--- a/share/mk/web.site.mk
+++ b/share/mk/web.site.mk
@@ -1,5 +1,5 @@
 # bsd.web.mk
-# $FreeBSD: www/share/mk/web.site.mk,v 1.65 2005/03/01 23:04:59 simon Exp $
+# $FreeBSD: www/share/mk/web.site.mk,v 1.66 2005/08/23 11:12:21 pav Exp $
 
 #
 # Build and install a web site.
@@ -50,10 +50,10 @@ TRUE?=		/usr/bin/true
 LOCALBASE?=	/usr/local
 PREFIX?=	${LOCALBASE}
 
-.if exists(${PREFIX}/bin/osgmlnorm)
-SGMLNORM?=	${PREFIX}/bin/osgmlnorm
-.else
+.if exists(${PREFIX}/bin/sgmlnorm) && !defined(OPENJADE)
 SGMLNORM?=	${PREFIX}/bin/sgmlnorm
+.else
+SGMLNORM?=	${PREFIX}/bin/osgmlnorm
 .endif
 CATALOG?=	${PREFIX}/share/sgml/html/catalog
 SGMLNORMOPTS?=	-d ${SGMLNORMFLAGS} -c ${CATALOG} -D ${.CURDIR}