Browse Source

doc: set locale explicitly for building doc.

Liang Chang 1 year ago
parent
commit
2d186d4cdd

+ 2 - 2
cde/doc/common/guides/guides_env.am

@@ -9,8 +9,8 @@ INFOLIBNAME = -n cde
 # orig: INFOLIBDESC = -d InfoLibDesc
 
 SSENTS = -m common/catalog
-DGENV = LC_CTYPE=$(LANG) SGML_SEARCH_PATH=".:.."
-DTINFOGENOPTIONS = $(SSENTS) $(INFOLIBNAME) -d $(INFOLIBDESC)
+DGENV = SGML_SEARCH_PATH=".:.."
+DTINFOGENOPTIONS = -L $(LANG) $(SSENTS) $(INFOLIBNAME) -d $(INFOLIBDESC)
 
 # Note the quad-dollar sign - this escapes $$ (pid) for the tmp
 # dir. This is required for multi-core builds to work.

+ 1 - 1
cde/doc/common/help/sdl-docs.am

@@ -19,7 +19,7 @@ DTHELP_HTAG2 = $(top_builddir)/programs/dthelp/parser/pass2/parser/dthelp_htag2
 # but the $(basename...) seems to add a space for some reason
 
 %.sdl:
-	LC_CTYPE=$(LANG) SGML_SEARCH_PATH=".:.." \
+	SGML_SEARCH_PATH=".:.." \
 		$(KSH) $(DTDOCBOOK) -H $(DTHELP_HTAG2) -L $(LANG) \
 			-o $@ `basename $@ .sdl`/book.sgm
 

+ 37 - 24
cde/doc/en_US.UTF-8/guides/man/man1_dt/docbook2infolib.sgm

@@ -22,10 +22,12 @@
 <cmdsynopsis>
 <command>dtdocbook2infolib admin</command>
 <arg choice="opt">-h</arg>
+<arg choice="plain">-L <replaceable>Locale</replaceable></arg>
 </cmdsynopsis>
 <cmdsynopsis>
 <command>dtdocbook2infolib build</command>
 <arg choice="opt">-h</arg>
+<arg choice="plain">-L <replaceable>Locale</replaceable></arg>
 <arg choice="opt">-T <replaceable>TmpDir</replaceable></arg>
 <arg choice="opt">-m <replaceable>CatalogFile</replaceable></arg>
 <arg choice="plain">-l <replaceable>Library</replaceable></arg>
@@ -36,6 +38,7 @@
 <cmdsynopsis>
 <command>dtdocbook2infolib tocgen</command>
 <arg choice="opt">-h</arg>
+<arg choice="plain">-L <replaceable>Locale</replaceable></arg>
 <arg choice="opt">-T <replaceable>TmpDir</replaceable></arg>
 <arg choice="opt">-m <replaceable>CatalogFile</replaceable></arg>
 <arg choice="opt">-id <replaceable>TOCid</replaceable></arg>
@@ -46,6 +49,7 @@
 <cmdsynopsis>
 <command>dtdocbook2infolib update</command>
 <arg choice="opt">-h</arg>
+<arg choice="plain">-L <replaceable>Locale</replaceable></arg>
 <arg choice="opt">-T <replaceable>TmpDir</replaceable></arg>
 <arg choice="opt">-m <replaceable>CatalogFile</replaceable></arg>
 <arg choice="plain">-b <replaceable>BookcaseName</replaceable></arg>
@@ -55,6 +59,7 @@
 <cmdsynopsis>
 <command>dtdocbook2infolib validate</command>
 <arg choice="opt">-h</arg>
+<arg choice="plain">-L <replaceable>Locale</replaceable></arg>
 <arg choice="opt">-T <replaceable>TmpDir</replaceable></arg>
 <arg choice="opt">-m <replaceable>CatalogFile</replaceable></arg>
 <arg choice="plain"><replaceable>SGMLdocument</replaceable></arg>
@@ -113,12 +118,16 @@ DocBook.DTD.
 <listitem><para>Displays a help message for each available option.
 </para></listitem>
 </varlistentry>
+<varlistentry><term><literal>-L</literal> <replaceable>Locale</replaceable></term>
+<listitem><para>Specifies the locale of the information library.
+</para></listitem>
+</varlistentry>
 <varlistentry><term><literal>-T</literal> <replaceable>TmpDir</replaceable></term>
 <listitem><para>Specifies the directory in which temporary files are placed during the
 build process. The default is to use the environment variable
 <systemitem class="environvar">TMPDIR</systemitem>. If variable
 <systemitem class="environvar">TMPDIR</systemitem> is not set,
-<filename>/usr/tmp</filename> is used.
+<filename>/tmp</filename> is used.
 </para>
 </listitem>
 </varlistentry>
@@ -207,9 +216,9 @@ administration functions to perform on a specified information library:
 </itemizedlist>
 <refsect2>
 <title>Example</title>
-<para>Enter the <command>dtdocbook2infolib admin</command> command in a shell window:
+<para>Enter the <command>dtdocbook2infolib admin -L en_US.UTF-8</command> command in a shell window:
 </para>
-<literallayout><command>dtdocbook2infolib admin</command>
+<literallayout><command>dtdocbook2infolib admin -L en_US.UTF-8</command>
 </literallayout>
 <para>The following menu appears:
 </para>
@@ -224,8 +233,7 @@ Please enter your choice [1-6]
 </literallayout>
 <para>Enter the number associated with the administrative task you
 want to perform.
-<command>dtdocbook2infolib admin</command> prompts for additional input as
-required.
+<command>dtdocbook2infolib admin -L en_US.UTF-8</command> prompts for additional input as required.
 </para>
 </refsect2>
 </refsect1>
@@ -238,14 +246,14 @@ It also creates a full-text search index.
 </para>
 <refsect2>
 <title>Example</title>
-<para>Enter the <command>dtdocbook2infolib build</command> command in a shell
-window.
+<para>Enter the <command>dtdocbook2infolib build -L en_US.UTF-8</command>
+command in a shell window.
 </para>
 <para>To build an information library containing multiple bookcases,
 an example command might be:
 </para>
 <programlisting>
-<userinput>build -l
+<userinput>dtdocbook2infolib build -L en_US.UTF-8 -l
 </userinput> <replaceable>UNIXLib</replaceable><userinput> -T
 </userinput> <filename>/usr/pers</filename><userinput>
 </userinput> <replaceable>ProgBooks</replaceable><userinput>
@@ -269,14 +277,14 @@ source file(s) for a book and generates a hypertext table of contents.
 </para>
 <refsect2>
 <title>Example</title>
-<para>Enter the <command>dtdocbook2infolib tocgen</command> command in a shell
-window.
+<para>Enter the <command>dtdocbook2infolib tocgen -L en_US.UTF-8</command>
+command in a shell window.
 </para>
 <para>To generate a hypertext table of contents for a book containing six SGML
 book source files, each of which contains a separate chapter, an example
 command might be:
 </para>
-<programlisting><userinput>dtdocbook2infolib tocgen -T
+<programlisting><userinput>dtdocbook2infolib tocgen -L en_US.UTF-8 -T
 </userinput> <filename>/usr/pers</filename><userinput> -f
 </userinput> <replaceable>Perl.TOC</replaceable><userinput> -id
 </userinput> <replaceable>Perl0594</replaceable>
@@ -302,18 +310,21 @@ during processing.
 </refsect1>
 <refsect1>
 <title>update</title>
-<para>The <command>dtdocbook2infolib update</command> command dynamically replaces
-existing style sheets in the DtInfo document database.
+<para>The <command>dtdocbook2infolib update -L en_US.UTF-8</command>
+command dynamically replaces existing style sheets in the DtInfo document
+database.
 </para>
 <refsect2>
 <title>Example</title>
-<para>Enter the <command>dtdocbook2infolib update</command> command in a shell window.
+<para>Enter the <command>dtdocbook2infolib update -L en_US.UTF-8</command>
+command in a shell window.
 </para>
-<para>Here is an example of a <command>dtdocbook2infolib update</command> command used
-to reformat the documents and/or document sections that use the
+<para>Here is an example of a <command>dtdocbook2infolib update -L en_US.UTF-8
+</command>
+command used to reformat the documents and/or document sections that use the
 specified style sheet:
 </para>
-<programlisting><userinput>dtdocbook2infolib update -T
+<programlisting><userinput>dtdocbook2infolib update -L en_US.UTF-8 -T
 </userinput> <filename>/usr/pers</filename><userinput> -b
 </userinput> <replaceable>ICE9</replaceable><userinput> -l
 </userinput> <replaceable>Brunn style</replaceable>
@@ -327,19 +338,21 @@ that is specified in the bookcase named <replaceable>ICE9</replaceable>.
 </refsect1>
 <refsect1>
 <title>validate</title>
-<para>The <command>dtdocbook2infolib validate</command> command performs SGML
-validation on bookcase specifications, on individual book source files,
-or any SGML document.
+<para>The <command>dtdocbook2infolib validate -L en_US.UTF-8</command>
+command performs SGML validation on bookcase specifications, on individual book
+source files, or any SGML document.
 </para>
 <refsect2>
 <title>Examples</title>
-<para>Enter the <command>dtdocbook2infolib validate</command> in a shell window.
+<para>Enter the <command>dtdocbook2infolib validate -L en_US.UTF-8</command>
+in a shell window.
 </para>
-<para>Here is an example of a <command>dtdocbook2infolib validate</command> command
-that performs validation on three SGML book source files:
+<para>Here is an example of a <command>dtdocbook2infolib validate -L en_US.UTF-8
+</command>
+command that performs validation on three SGML book source files:
 </para>
 <programlisting>
-<userinput>dtdocbook2infolib validate
+<userinput>dtdocbook2infolib validate -L en_US.UTF-8
 </userinput> <replaceable>03.Structure.N</replaceable><userinput>
 </userinput> <replaceable>04.Process.N</replaceable><userinput>
 </userinput> <replaceable>05.BookArea.N</replaceable>

+ 4 - 1
cde/doc/en_US.UTF-8/man/Makefile.am

@@ -1,6 +1,9 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-DBTOMAN = $(top_srcdir)/programs/dtdocbook/doc_utils/dtdocbook2man
+# this sets the LANG variables
+include $(top_srcdir)/programs/localized/templates/English.am
+
+DBTOMAN = $(top_srcdir)/programs/dtdocbook/doc_utils/dtdocbook2man $(LANG)
 
 # first, the man pages broken down by sections
 MANSEC1 = man1/tttrace.1 man1/tttar.1 man1/ttsession.1 man1/ttrmdir.1	\