os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

- Rework jade/openjade handling.

Browse source 
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)
This commit is contained in:
Pav Lucistnik 2005-08-30 19:32:46 +00:00
parent 15b0e9eba2
commit 6a1ea94077
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=25517
2 changed files with 11 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
share/mk/doc.docbook.mk
View file

@ -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)
JADE?= ${PREFIX}/bin/openjade
JADECATALOG?= ${PREFIX}/share/sgml/openjade/catalog
NSGMLS?= ${PREFIX}/bin/onsgmls
JADEFLAGS+= -V openjade
SX?= ${PREFIX}/bin/osx
.else
.if exists(${PREFIX}/bin/jade) && !defined(OPENJADE)
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)

12
share/mk/doc.html.mk
View file

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