suggestion for adding a l10n-capable doc-format navi

[Hiroki Sato]

"Bruce A. Mah" <bmah at freebsd.org> wrote
  in <200304191540.h3JFeSxV052609 at 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  <hrs at eos.ocn.ne.jp> / <hrs at FreeBSD.org>
-------------- next part --------------
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