From owner-freebsd-doc@FreeBSD.ORG Sat Apr 19 10:07:41 2003 Return-Path: Delivered-To: freebsd-doc@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AB9F037B401; Sat, 19 Apr 2003 10:07:41 -0700 (PDT) Received: from smtp.eos.ocn.ne.jp (eos.ocn.ne.jp [211.6.83.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id D0E1E43FA3; Sat, 19 Apr 2003 10:07:40 -0700 (PDT) (envelope-from hrs@eos.ocn.ne.jp) Received: from mail.allbsd.org (p53054-adsao12honb4-acca.tokyo.ocn.ne.jp [220.96.135.54]) by smtp.eos.ocn.ne.jp (Postfix) with ESMTP id BA7A73075; Sun, 20 Apr 2003 02:07:39 +0900 (JST) Received: from localhost (alph.allbsd.org [192.168.0.10]) h3JH6tJp067958; Sun, 20 Apr 2003 02:06:56 +0900 (JST) (envelope-from hrs@eos.ocn.ne.jp) Date: Sun, 20 Apr 2003 02:04:36 +0900 (JST) Message-Id: <20030420.020436.102903006.hrs@eos.ocn.ne.jp> To: bmah@freebsd.org From: Hiroki Sato In-Reply-To: <200304191540.h3JFeSxV052609@bmah.dyndns.org> References: <20030414.053436.95910003.hrs@eos.ocn.ne.jp> <20030419.204208.38720452.hrs@eos.ocn.ne.jp> <200304191540.h3JFeSxV052609@bmah.dyndns.org> X-PGPkey-fingerprint: BDB3 443F A5DD B3D0 A530 FFD7 4F2C D3D8 2793 CF2D X-Mailer: Mew version 2.2 on Emacs 20.7 / Mule 4.0 (HANANOEN) Mime-Version: 1.0 Content-Type: Multipart/Mixed; boundary="--Next_Part(Sun_Apr_20_02:04:36_2003_305)--" Content-Transfer-Encoding: 7bit cc: doc@freebsd.org Subject: Re: suggestion for adding a l10n-capable doc-format navi X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Apr 2003 17:07:42 -0000 ----Next_Part(Sun_Apr_20_02:04:36_2003_305)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit "Bruce A. Mah" wrote in <200304191540.h3JFeSxV052609@bmah.dyndns.org>: bmah> Random thought: I wonder if it'd have been better to leaving it default bmah> to "WITH_DOCFORMAT_NAVI_LINK?=NO" and then explicitly setting bmah> "WITH_DOCFORMAT_NAVI_LINK=YES" in the Web site build, the release build bmah> doc.1 target, etc. The case I am thinking of is that if someone builds bmah> an html version only (the default), they'll get a dangling link to a bmah> non-existant (or stale) html-split version. Yes, you have got a point. I made another patch that makes the link be generated only when ${FORMATS} includes both of "html" and "html-split," and "WITH_DOCFORMAT_NAVI_LINK=YES." In the current doc.docbook.mk WITH_FOO=NO does not work properly, but the patch fixes it, too. I have no idea if the link should be added by default or not.... -- | Hiroki SATO / ----Next_Part(Sun_Apr_20_02:04:36_2003_305)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="doc.docbook.mk.diff" Index: doc.docbook.mk =================================================================== RCS file: /home/dcvs/doc/share/mk/doc.docbook.mk,v retrieving revision 1.82 diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.82 doc.docbook.mk --- doc.docbook.mk 19 Apr 2003 11:39:30 -0000 1.82 +++ doc.docbook.mk 19 Apr 2003 16:36:13 -0000 @@ -192,19 +192,21 @@ PNMTOPSFLAGS+= -rle .endif -.if !defined(WITH_INLINE_LEGALNOTICE) || empty(WITH_INLINE_LEGALNOTICE) +.if !defined(WITH_INLINE_LEGALNOTICE) || (${WITH_INLINE_LEGALNOTICE} != "YES") HTMLFLAGS+= -V %generate-legalnotice-link% .endif -.if defined(WITH_ARTICLE_TOC) && !empty(WITH_ARTICLE_TOC) +.if defined(WITH_ARTICLE_TOC) && (${WITH_ARTICLE_TOC} == "YES") HTMLFLAGS+= -V %generate-article-toc% PRINTFLAGS+= -V %generate-article-toc% .endif -.if defined(WITH_BIBLIOXREF_TITLE) && !empty(WITH_BIBLIOXREF_TITLE) +.if defined(WITH_BIBLIOXREF_TITLE) && (${WITH_BIBLIOXREF_TITLE} == "YES") HTMLFLAGS+= -V biblio-xref-title PRINTFLAGS+= -V biblio-xref-title .endif -.if defined(WITH_DOCFORMAT_NAVI_LINK) && !empty(WITH_DOCFORMAT_NAVI_LINK) +.if (${FORMATS:Mhtml} == "html") && (${FORMATS:Mhtml-split} == "html-split") +.if defined(WITH_DOCFORMAT_NAVI_LINK) && (${WITH_DOCFORMAT_NAVI_LINK} == "YES") HTMLFLAGS+= -V %generate-docformat-navi-link% +.endif .endif PERL?= /usr/bin/perl ----Next_Part(Sun_Apr_20_02:04:36_2003_305)----