Date: Sat, 15 Feb 2003 13:58:29 +0900 (JST) From: Hiroki Sato <hrs@eos.ocn.ne.jp> To: doc@FreeBSD.ORG Subject: doc.docbook.mk diff Message-ID: <20030215.135829.102526182.hrs@eos.ocn.ne.jp>
next in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
Hi,
I replaced ${JADEFLAGS} specified in doc/ with some make variables.
The attached patch makes some knobs in Norm's dsssl stylesheet
available via the following variables:
- WITH_INLINE_LEGALNOTICE (for HTML only):
do not render <legalnotice> as a separate file if defined.
- WITH_ARTICLE_TOC:
generate TOC for documents whose root element is <article> if defined.
- WITH_BIBLIOXREF_TITLE:
for cross references to bibliography entries, use the title of
the entry as the cross reference text, if defined.
I would like to commit this. Any comments?
--
| Hiroki SATO <hrs@eos.ocn.ne.jp> / <hrs@FreeBSD.org>
[-- Attachment #2 --]
Index: share/mk/doc.docbook.mk
===================================================================
RCS file: /home/ncvs/doc/share/mk/doc.docbook.mk,v
retrieving revision 1.77
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.77 doc.docbook.mk
--- share/mk/doc.docbook.mk 1 Feb 2003 15:14:40 -0000 1.77
+++ share/mk/doc.docbook.mk 15 Feb 2003 04:41:32 -0000
@@ -192,6 +192,18 @@
PNMTOPSFLAGS+= -rle
.endif
+.if !defined(WITH_INLINE_LEGALNOTICE) || empty(WITH_INLINE_LEGALNOTICE)
+HTMLFLAGS+= -V %generate-legalnotice-link%
+.endif
+.if defined(WITH_ARTICLE_TOC) && !empty(WITH_ARTICLE_TOC)
+HTMLFLAGS+= -V %generate-article-toc%
+PRINTFLAGS+= -V %generate-article-toc%
+.endif
+.if defined(WITH_BIBLIOXREF_TITLE) && !empty(WITH_BIBLIOXREF_TITLE)
+HTMLFLAGS+= -V biblio-xref-title
+PRINTFLAGS+= -V biblio-xref-title
+.endif
+
PERL?= /usr/bin/perl
PKG_CREATE?= /usr/sbin/pkg_create
SORT?= /usr/bin/sort
Index: share/sgml/freebsd.dsl
===================================================================
RCS file: /home/ncvs/doc/share/sgml/freebsd.dsl,v
retrieving revision 1.68
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.68 freebsd.dsl
--- share/sgml/freebsd.dsl 20 Nov 2002 19:41:10 -0000 1.68
+++ share/sgml/freebsd.dsl 15 Feb 2003 04:14:24 -0000
@@ -60,7 +60,7 @@
;;
;; Naturally, this has no effect if you're building one big
;; HTML file.
- #t)
+ #f)
(define (book-titlepage-recto-elements)
(list (normalize "title")
Index: en_US.ISO8859-1/articles/committers-guide/Makefile
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/committers-guide/Makefile,v
retrieving revision 1.4
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.4 Makefile
--- en_US.ISO8859-1/articles/committers-guide/Makefile 8 Apr 2001 17:26:59 -0000 1.4
+++ en_US.ISO8859-1/articles/committers-guide/Makefile 15 Feb 2003 04:26:47 -0000
@@ -13,7 +13,7 @@
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
-JADEFLAGS+= -V %generate-article-toc%
+WITH_ARTICLE_TOC=YES
#
# SRCS lists the individual SGML files that make up the document. Changes
Index: en_US.ISO8859-1/articles/contributing/Makefile
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/contributing/Makefile,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 Makefile
--- en_US.ISO8859-1/articles/contributing/Makefile 8 Oct 2001 06:18:45 -0000 1.1
+++ en_US.ISO8859-1/articles/contributing/Makefile 15 Feb 2003 04:27:57 -0000
@@ -7,7 +7,7 @@
INSTALL_COMPRESSED?=gz
INSTALL_ONLY_COMPRESSED?=
-JADEFLAGS+= -V %generate-article-toc%
+WITH_ARTICLE_TOC=YES
SRCS= article.sgml
Index: en_US.ISO8859-1/articles/contributors/Makefile
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/contributors/Makefile,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 Makefile
--- en_US.ISO8859-1/articles/contributors/Makefile 1 Aug 2001 23:22:35 -0000 1.1
+++ en_US.ISO8859-1/articles/contributors/Makefile 15 Feb 2003 04:27:02 -0000
@@ -7,7 +7,7 @@
INSTALL_COMPRESSED?=gz
INSTALL_ONLY_COMPRESSED?=
-JADEFLAGS+= -V %generate-article-toc%
+WITH_ARTICLE_TOC=YES
SRCS= article.sgml
Index: en_US.ISO8859-1/articles/cvsup-advanced/Makefile
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/cvsup-advanced/Makefile,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 Makefile
--- en_US.ISO8859-1/articles/cvsup-advanced/Makefile 10 Oct 2001 21:38:30 -0000 1.1
+++ en_US.ISO8859-1/articles/cvsup-advanced/Makefile 15 Feb 2003 04:28:11 -0000
@@ -7,7 +7,7 @@
INSTALL_COMPRESSED?=gz
INSTALL_ONLY_COMPRESSED?=
-JADEFLAGS+= -V %generate-article-toc%
+WITH_ARTICLE_TOC=YES
SRCS= article.sgml
Index: en_US.ISO8859-1/articles/hubs/Makefile
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/hubs/Makefile,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 Makefile
--- en_US.ISO8859-1/articles/hubs/Makefile 31 Jan 2002 20:56:47 -0000 1.1
+++ en_US.ISO8859-1/articles/hubs/Makefile 15 Feb 2003 04:29:01 -0000
@@ -7,7 +7,7 @@
INSTALL_COMPRESSED?=gz
INSTALL_ONLY_COMPRESSED?=
-JADEFLAGS+= -V %generate-article-toc%
+WITH_ARTICLE_TOC=YES
SRCS= article.sgml
Index: en_US.ISO8859-1/articles/pam/Makefile
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/pam/Makefile,v
retrieving revision 1.4
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.4 Makefile
--- en_US.ISO8859-1/articles/pam/Makefile 7 Jun 2002 15:45:24 -0000 1.4
+++ en_US.ISO8859-1/articles/pam/Makefile 15 Feb 2003 04:24:56 -0000
@@ -7,7 +7,8 @@
INSTALL_COMPRESSED?=gz
INSTALL_ONLY_COMPRESSED?=
-JADEFLAGS+= -V %generate-article-toc%
+WITH_ARTICLE_TOC=YES
+WITH_INLINE_LEGALNOTICE=YES
SRCS= article.sgml pam_app.c pam_conv.c pam_module.c
Index: en_US.ISO8859-1/articles/pr-guidelines/Makefile
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/pr-guidelines/Makefile,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 Makefile
--- en_US.ISO8859-1/articles/pr-guidelines/Makefile 9 May 2002 12:28:53 -0000 1.1
+++ en_US.ISO8859-1/articles/pr-guidelines/Makefile 15 Feb 2003 04:29:15 -0000
@@ -7,7 +7,7 @@
INSTALL_COMPRESSED?=gz
INSTALL_ONLY_COMPRESSED?=
-JADEFLAGS+= -V %generate-article-toc%
+WITH_ARTICLE_TOC=YES
SRCS= article.sgml
Index: en_US.ISO8859-1/articles/problem-reports/Makefile
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/problem-reports/Makefile,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 Makefile
--- en_US.ISO8859-1/articles/problem-reports/Makefile 23 Nov 2001 01:01:51 -0000 1.1
+++ en_US.ISO8859-1/articles/problem-reports/Makefile 15 Feb 2003 04:28:34 -0000
@@ -7,7 +7,7 @@
INSTALL_COMPRESSED?=gz
INSTALL_ONLY_COMPRESSED?=
-JADEFLAGS+= -V %generate-article-toc%
+WITH_ARTICLE_TOC=YES
SRCS= article.sgml
Index: en_US.ISO8859-1/articles/releng/Makefile
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/releng/Makefile,v
retrieving revision 1.7
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.7 Makefile
--- en_US.ISO8859-1/articles/releng/Makefile 25 Jul 2002 09:40:59 -0000 1.7
+++ en_US.ISO8859-1/articles/releng/Makefile 15 Feb 2003 04:28:48 -0000
@@ -10,7 +10,7 @@
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
-JADEFLAGS+= -V %generate-article-toc%
+WITH_ARTICLE_TOC=YES
# SGML content
SRCS= article.sgml branches.ascii
Index: en_US.ISO8859-1/articles/smp/Makefile
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/smp/Makefile,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 Makefile
--- en_US.ISO8859-1/articles/smp/Makefile 2 Dec 2002 16:38:13 -0000 1.1
+++ en_US.ISO8859-1/articles/smp/Makefile 15 Feb 2003 04:29:25 -0000
@@ -9,7 +9,7 @@
INSTALL_COMPRESSED?=gz
INSTALL_ONLY_COMPRESSED?=
-JADEFLAGS+= -V %generate-article-toc%
+WITH_ARTICLE_TOC=YES
SRCS= article.sgml
Index: en_US.ISO8859-1/articles/solid-state/Makefile
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/solid-state/Makefile,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 Makefile
--- en_US.ISO8859-1/articles/solid-state/Makefile 20 Jun 2001 16:12:33 -0000 1.1
+++ en_US.ISO8859-1/articles/solid-state/Makefile 15 Feb 2003 04:27:25 -0000
@@ -10,7 +10,7 @@
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
-JADEFLAGS+= -V %generate-article-toc%
+WITH_ARTICLE_TOC=YES
#
# SRCS lists the individual SGML files that make up the document. Changes
Index: en_US.ISO8859-1/books/faq/Makefile
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/faq/Makefile,v
retrieving revision 1.7
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.7 Makefile
--- en_US.ISO8859-1/books/faq/Makefile 20 May 2001 23:04:46 -0000 1.7
+++ en_US.ISO8859-1/books/faq/Makefile 15 Feb 2003 04:31:21 -0000
@@ -13,7 +13,7 @@
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
-JADEFLAGS+=-Vbiblio-xref-title
+WITH_BIBLIOXREF_TITLE=YES
#
# SRCS lists the individual SGML files that make up the document. Changes
# to any of these files will force a rebuild
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030215.135829.102526182.hrs>