a) "Fix" out-of-tree builds by not hard-coding locations of dsl files

with SYSTEM, and using instead PUBLIC entities gained from the catalog
in the directory of the language the document belongs to, or the
language-neutral entity.  Now we always use default.dsl as our dsl
master, and it grabs the necessary magic from the catalogs.

b) Fix the always-out-of-date imagelib problem with some make(1)-fu.

Approved by:	nik (ages ago)
This commit is contained in:
Neil Blakey-Milner 2000-09-28 23:29:48 +00:00
parent 3977541278
commit 1c78f1c07d
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=8040
29 changed files with 178 additions and 38 deletions
de_DE.ISO8859-1/share/sgml
de_DE.ISO_8859-1/share/sgml
en_US.ISO8859-1/share/sgml
en_US.ISO_8859-1/share/sgml
es_ES.ISO8859-1/share/sgml
es_ES.ISO_8859-1/share/sgml
fr_FR.ISO8859-1/share/sgml
fr_FR.ISO_8859-1/share/sgml
ja_JP.eucJP/share/sgml
nl_NL.ISO8859-1/share/sgml
nl_NL.ISO_8859-1/share/sgml
ru_RU.KOI8-R/share/sgml
share
zh_TW.Big5/share/sgml

View file

@ -0,0 +1,9 @@
-- ...................................................................... --
-- FreeBSD SGML Public Identifiers ...................................... --
-- $FreeBSD: doc/share/sgml/catalog,v 1.9 2000/07/08 16:31:28 phantom Exp $
--
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
"freebsd.dsl"

View file

@ -1,7 +1,7 @@
<!-- $FreeBSD$ -->
<!-- $FreeBSD: doc/de_DE.ISO_8859-1/share/sgml/freebsd.dsl,v 1.1 2000/06/09 12:26:38 alex Exp $ -->
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY freebsd.dsl SYSTEM "../../../share/sgml/freebsd.dsl" CDATA DSSSL>
<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
]>
<style-sheet>

View file

@ -0,0 +1,9 @@
-- ...................................................................... --
-- FreeBSD SGML Public Identifiers ...................................... --
-- $FreeBSD: doc/share/sgml/catalog,v 1.9 2000/07/08 16:31:28 phantom Exp $
--
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
"freebsd.dsl"

View file

@ -1,7 +1,7 @@
<!-- $FreeBSD$ -->
<!-- $FreeBSD: doc/de_DE.ISO_8859-1/share/sgml/freebsd.dsl,v 1.1 2000/06/09 12:26:38 alex Exp $ -->
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY freebsd.dsl SYSTEM "../../../share/sgml/freebsd.dsl" CDATA DSSSL>
<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
]>
<style-sheet>

View file

@ -0,0 +1,9 @@
-- ...................................................................... --
-- FreeBSD SGML Public Identifiers ...................................... --
-- $FreeBSD: doc/share/sgml/catalog,v 1.9 2000/07/08 16:31:28 phantom Exp $
--
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
"freebsd.dsl"

View file

@ -1,7 +1,7 @@
<!-- $FreeBSD: doc/en_US.ISO_8859-1/share/sgml/freebsd.dsl,v 1.2 2000/05/31 23:39:18 nik Exp $ -->
<!-- $FreeBSD: doc/en_US.ISO_8859-1/share/sgml/freebsd.dsl,v 1.3 2000/06/08 01:58:59 jim Exp $ -->
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY freebsd.dsl SYSTEM "../../../share/sgml/freebsd.dsl" CDATA DSSSL>
<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
<!ENTITY % output.html "IGNORE">
<!ENTITY % output.print "IGNORE">
]>

View file

@ -0,0 +1,9 @@
-- ...................................................................... --
-- FreeBSD SGML Public Identifiers ...................................... --
-- $FreeBSD: doc/share/sgml/catalog,v 1.9 2000/07/08 16:31:28 phantom Exp $
--
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
"freebsd.dsl"

View file

@ -1,7 +1,7 @@
<!-- $FreeBSD: doc/en_US.ISO_8859-1/share/sgml/freebsd.dsl,v 1.2 2000/05/31 23:39:18 nik Exp $ -->
<!-- $FreeBSD: doc/en_US.ISO_8859-1/share/sgml/freebsd.dsl,v 1.3 2000/06/08 01:58:59 jim Exp $ -->
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY freebsd.dsl SYSTEM "../../../share/sgml/freebsd.dsl" CDATA DSSSL>
<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
<!ENTITY % output.html "IGNORE">
<!ENTITY % output.print "IGNORE">
]>

View file

@ -0,0 +1,9 @@
-- ...................................................................... --
-- FreeBSD SGML Public Identifiers ...................................... --
-- $FreeBSD: doc/share/sgml/catalog,v 1.9 2000/07/08 16:31:28 phantom Exp $
--
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
"freebsd.dsl"

View file

@ -1,7 +1,7 @@
<!-- $FreeBSD$ -->
<!-- $FreeBSD: doc/es_ES.ISO_8859-1/share/sgml/freebsd.dsl,v 1.1 2000/03/23 09:00:07 nik Exp $ -->
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY freebsd.dsl SYSTEM "../../../share/sgml/freebsd.dsl" CDATA DSSSL>
<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
]>
<style-sheet>

View file

@ -0,0 +1,9 @@
-- ...................................................................... --
-- FreeBSD SGML Public Identifiers ...................................... --
-- $FreeBSD: doc/share/sgml/catalog,v 1.9 2000/07/08 16:31:28 phantom Exp $
--
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
"freebsd.dsl"

View file

@ -1,7 +1,7 @@
<!-- $FreeBSD$ -->
<!-- $FreeBSD: doc/es_ES.ISO_8859-1/share/sgml/freebsd.dsl,v 1.1 2000/03/23 09:00:07 nik Exp $ -->
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY freebsd.dsl SYSTEM "../../../share/sgml/freebsd.dsl" CDATA DSSSL>
<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
]>
<style-sheet>

View file

@ -0,0 +1,9 @@
-- ...................................................................... --
-- FreeBSD SGML Public Identifiers ...................................... --
-- $FreeBSD: doc/share/sgml/catalog,v 1.9 2000/07/08 16:31:28 phantom Exp $
--
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
"freebsd.dsl"

View file

@ -1,7 +1,7 @@
<!-- $FreeBSD$ -->
<!-- $FreeBSD: doc/fr_FR.ISO_8859-1/share/sgml/freebsd.dsl,v 1.1 2000/03/23 09:00:08 nik Exp $ -->
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY freebsd.dsl SYSTEM "../../../share/sgml/freebsd.dsl" CDATA DSSSL>
<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
]>
<style-sheet>

View file

@ -0,0 +1,9 @@
-- ...................................................................... --
-- FreeBSD SGML Public Identifiers ...................................... --
-- $FreeBSD: doc/share/sgml/catalog,v 1.9 2000/07/08 16:31:28 phantom Exp $
--
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
"freebsd.dsl"

View file

@ -1,7 +1,7 @@
<!-- $FreeBSD$ -->
<!-- $FreeBSD: doc/fr_FR.ISO_8859-1/share/sgml/freebsd.dsl,v 1.1 2000/03/23 09:00:08 nik Exp $ -->
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY freebsd.dsl SYSTEM "../../../share/sgml/freebsd.dsl" CDATA DSSSL>
<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
]>
<style-sheet>

View file

@ -0,0 +1,9 @@
-- ...................................................................... --
-- FreeBSD SGML Public Identifiers ...................................... --
-- $FreeBSD: doc/share/sgml/catalog,v 1.9 2000/07/08 16:31:28 phantom Exp $
--
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
"freebsd.dsl"

View file

@ -1,7 +1,7 @@
<!-- $FreeBSD: doc/ja_JP.eucJP/share/sgml/freebsd.dsl,v 1.1 2000/03/23 09:00:13 nik Exp $ -->
<!-- $FreeBSD: doc/ja_JP.eucJP/share/sgml/freebsd.dsl,v 1.2 2000/03/27 04:38:47 kuriyama Exp $ -->
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY freebsd.dsl SYSTEM "../../../share/sgml/freebsd.dsl" CDATA DSSSL>
<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
<!ENTITY % lang.ja.dsssl "IGNORE">
]>

View file

@ -0,0 +1,9 @@
-- ...................................................................... --
-- FreeBSD SGML Public Identifiers ...................................... --
-- $FreeBSD: doc/share/sgml/catalog,v 1.9 2000/07/08 16:31:28 phantom Exp $
--
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
"freebsd.dsl"

View file

@ -0,0 +1,9 @@
-- ...................................................................... --
-- FreeBSD SGML Public Identifiers ...................................... --
-- $FreeBSD: doc/share/sgml/catalog,v 1.9 2000/07/08 16:31:28 phantom Exp $
--
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
"freebsd.dsl"

View file

@ -0,0 +1,9 @@
-- ...................................................................... --
-- FreeBSD SGML Public Identifiers ...................................... --
-- $FreeBSD: doc/share/sgml/catalog,v 1.9 2000/07/08 16:31:28 phantom Exp $
--
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
"freebsd.dsl"

View file

@ -1,7 +1,7 @@
<!-- $FreeBSD: doc/ru_RU.KOI8-R/share/sgml/freebsd.dsl,v 1.1 2000/03/23 09:00:15 nik Exp $ -->
<!-- $FreeBSD: doc/ru_RU.KOI8-R/share/sgml/freebsd.dsl,v 1.2 2000/04/03 15:11:30 phantom Exp $ -->
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY freebsd.dsl SYSTEM "../../../share/sgml/freebsd.dsl" CDATA DSSSL>
<!ENTITY freebsd.dsl SYSTEM "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
<!ENTITY % lang.ru.dsssl "IGNORE">
]>

View file

@ -1,5 +1,5 @@
#
# $FreeBSD: doc/share/mk/doc.docbook.mk,v 1.16 2000/07/18 16:30:45 nik Exp $
# $FreeBSD: doc/share/mk/doc.docbook.mk,v 1.17 2000/09/25 08:17:03 nik Exp $
#
# This include file <doc.docbook.mk> handles building and installing of
# DocBook documentation in the FreeBSD Documentation Project.
@ -49,9 +49,10 @@ MASTERDOC?= ${.CURDIR}/${DOC}.sgml
JADE= ${PREFIX}/bin/jade
DSLHTML?= ${DOC_PREFIX}/${LANGCODE}/share/sgml/freebsd.dsl
DSLPRINT?= ${DOC_PREFIX}/${LANGCODE}/share/sgml/freebsd.dsl
DSLHTML?= ${DOC_PREFIX}/share/sgml/default.dsl
DSLPRINT?= ${DOC_PREFIX}/share/sgml/default.dsl
FREEBSDCATALOG= ${DOC_PREFIX}/share/sgml/catalog
LANGUAGECATALOG=${DOC_PREFIX}/${LANGCODE}/share/sgml/catalog
DOCBOOKCATALOG= ${PREFIX}/share/sgml/docbook/catalog
JADECATALOG= ${PREFIX}/share/sgml/jade/catalog
@ -59,7 +60,7 @@ DSSSLCATALOG= ${PREFIX}/share/sgml/docbook/dsssl/modular/catalog
LIB_IMAGES?=
JADEOPTS= ${JADEFLAGS} -c ${FREEBSDCATALOG} -c ${DSSSLCATALOG} -c ${DOCBOOKCATALOG} -c ${JADECATALOG} ${EXTRA_CATALOGS:S/^/-c /g}
JADEOPTS= ${JADEFLAGS} -c ${LANGUAGECATALOG} -c ${FREEBSDCATALOG} -c ${DSSSLCATALOG} -c ${DOCBOOKCATALOG} -c ${JADECATALOG} ${EXTRA_CATALOGS:S/^/-c /g}
KNOWN_FORMATS= html html.tar html-split html-split.tar txt rtf ps pdf tex dvi tar pdb
@ -138,9 +139,6 @@ CLEANFILES+= ${DOC}.rtf
.elif ${_cf} == "tar"
_docs+= ${DOC}.tar
CLEANFILES+= ${DOC}.tar
.elif ${_cf} == "doc"
_docs+= ${DOC}.doc
CLEANFILES+= ${DOC}.doc
.elif ${_cf} == "pdb"
_docs+= ${DOC}.pdb ${.CURDIR:T}.pdb
+CLEANFILES+= ${DOC}.pdb ${.CURDIR:T}.pdb
@ -171,18 +169,22 @@ CLEANFILES+= ${DOC}.${_curformat}.${_curcomp}
all: ${_docs}
index.html HTML.manifest: ${SRCS} ${LIB_IMAGES}
index.html HTML.manifest: ${SRCS}
${JADE} -V html-manifest -ioutput.html ${JADEOPTS} -d ${DSLHTML} -t sgml ${MASTERDOC}
.if !defined(NO_TIDY)
-tidy -i -m -f /dev/null ${TIDYFLAGS} `xargs < HTML.manifest`
.endif
${DOC}.html: ${SRCS} ${LIB_IMAGES}
${DOC}.html: ${SRCS}
${JADE} -ioutput.html -V nochunks ${JADEOPTS} -d ${DSLHTML} -t sgml ${MASTERDOC} > ${.TARGET}
.if !defined(NO_TIDY)
-tidy -i -m -f /dev/null ${TIDYFLAGS} ${.TARGET}
.endif
.for _curimage in ${LIB_IMAGES}
${_docs}: ${LOCAL_LIB_IMAGES_DIR}/${_curimage}
.endfor
${DOC}.html-split.tar: HTML.manifest
tar cf ${.TARGET} `xargs < HTML.manifest`
tar uf ${.TARGET} ${LIB_IMAGES}

View file

@ -1,5 +1,5 @@
#
# $FreeBSD: doc/share/mk/doc.images.mk,v 1.1 2000/07/16 16:27:30 nik Exp $
# $FreeBSD: doc/share/mk/doc.images.mk,v 1.2 2000/07/18 16:30:45 nik Exp $
#
# This include file <doc.images.mk> handles image processing.
#
@ -60,7 +60,7 @@ MKDIR?= /bin/mkdir
# ${LIB_IMAGES_DIR} to the same place in ${LOCAL_LIB_IMAGES_DIR}.
#
.for _curimage in ${LIB_IMAGES}
${_curimage}: ${LIB_IMAGES_DIR}/${_curimage}
[ -d ${LOCAL_LIB_IMAGES_DIR}/${_curimage:H} ] || ${MKDIR} -p ${LOCAL_LIB_IMAGES_DIR}/${_curimage:H}
${CP} ${LIB_IMAGES_DIR}/${_curimage} ${LOCAL_LIB_IMAGES_DIR}/${_curimage}
${LOCAL_LIB_IMAGES_DIR}/${_curimage}: ${LIB_IMAGES_DIR}/${_curimage}
@[ -d ${LOCAL_LIB_IMAGES_DIR}/${_curimage:H} ] || ${MKDIR} -p ${LOCAL_LIB_IMAGES_DIR}/${_curimage:H}
${INSTALL} -C -c ${LIB_IMAGES_DIR}/${_curimage} ${LOCAL_LIB_IMAGES_DIR}/${_curimage}
.endfor

View file

@ -1,5 +1,5 @@
#
# $FreeBSD: doc/share/mk/doc.project.mk,v 1.4 2000/07/16 16:29:18 nik Exp $
# $FreeBSD: doc/share/mk/doc.project.mk,v 1.5 2000/07/23 16:27:58 nik Exp $
#
# This include file <doc.project.mk> is the FreeBSD Documentation Project
# co-ordination make file.
@ -67,6 +67,8 @@ ALL_FORMATS= html html.tar html-split html-split.tar txt rtf ps pdf tex dvi tar
PREFIX?= /usr/local
PRI_LANG?= en_US.ISO_8859-1
.include "doc.images.mk"
# Format-specific configuration
.if defined(DOC)
.if ${DOCFORMAT} == "docbook"
@ -80,5 +82,4 @@ PRI_LANG?= en_US.ISO_8859-1
# Subdirectory glue and ownership information.
.include "doc.subdir.mk"
.include "doc.install.mk"
.include "doc.images.mk"

View file

@ -1,7 +1,7 @@
-- ...................................................................... --
-- FreeBSD SGML Public Identifiers ...................................... --
-- $FreeBSD: doc/share/sgml/catalog,v 1.8 1999/11/14 17:57:31 nik Exp $
-- $FreeBSD: doc/share/sgml/catalog,v 1.9 2000/07/08 16:31:28 phantom Exp $
--
-- ...................................................................... --
@ -17,6 +17,12 @@ PUBLIC "-//FreeBSD//DTD DocBook V3.1-Based Extension//EN"
PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
"man-refs.ent"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
"freebsd.dsl"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN"
"freebsd.dsl"
-- ...................................................................... --
-- English specific ..................................................... --

14
share/sgml/default.dsl Normal file
View file

@ -0,0 +1,14 @@
<!-- $FreeBSD: doc/share/sgml/freebsd.dsl,v 1.16 2000/07/25 18:23:45 ben Exp $ -->
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN" CDATA DSSSL>
]>
<style-sheet>
<style-specification use="docbook">
<style-specification-body>
</style-specification-body>
</style-specification>
<external-specification id="docbook" document="freebsd.dsl">
</style-sheet>

View file

@ -0,0 +1,9 @@
-- ...................................................................... --
-- FreeBSD SGML Public Identifiers ...................................... --
-- $FreeBSD: doc/share/sgml/catalog,v 1.9 2000/07/08 16:31:28 phantom Exp $
--
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
"freebsd.dsl"

View file

@ -1,7 +1,7 @@
<!-- $FreeBSD: doc/zh_TW.Big5/share/sgml/freebsd.dsl,v 1.1 2000/03/23 09:00:17 nik Exp $ -->
<!-- $FreeBSD: doc/zh_TW.Big5/share/sgml/freebsd.dsl,v 1.2 2000/08/31 13:24:35 phantom Exp $ -->
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY freebsd.dsl SYSTEM "../../../share/sgml/freebsd.dsl" CDATA DSSSL>
<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
<!ENTITY % lang.zh.dsssl "IGNORE">
]>