Archive w3m and allow linux-pam doc to be built with lynx

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@21481 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
Pierre Labastie 2019-04-20 18:59:41 +00:00
parent d38dc9aa42
commit 1eac9eb892
11 changed files with 43 additions and 22 deletions

View File

@ -16,8 +16,8 @@
<?dbhtml filename="w3m.html"?>
<sect1info>
<othername>$LastChangedBy$</othername>
<date>$Date$</date>
<othername>$LastChangedBy: pierre $</othername>
<date>$Date: 2019-02-15 22:01:29 +0100 (ven. 15 févr. 2019) $</date>
</sect1info>
<title>W3m-&w3m-version;</title>

View File

@ -63,6 +63,7 @@
<!ENTITY pypi "https://pypi.python.org/pypi">
<!ENTITY appstream-glib-url "http://people.freedesktop.org/~hughsient/appstream-glib/releases">
<!ENTITY elinks-url "http://elinks.or.cz">
<!ENTITY w3m-url "http://w3m.sourceforge.net/">
<!-- These entities are used to identify versions of LFS
packages referenced throughout the BLFS book. -->

View File

@ -100,7 +100,6 @@
<xref linkend="sdl"/>,
<xref linkend="gobject-introspection"/>,
<xref linkend="vala"/>,
<xref linkend="w3m"/>,
<xref linkend="gexiv2"/>,
<ulink url="http://lensfun.sourceforge.net/">lensfun</ulink>,
<ulink url="http://libopenraw.freedesktop.org/wiki/">libopenraw</ulink>,
@ -108,8 +107,9 @@
<ulink url="http://faculty.cse.tamu.edu/davis/suitesparse.html">libumfpack</ulink>,
<ulink url="http://luajit.org/luajit.html">LuaJIT</ulink>,
<ulink url="https://github.com/hodefoting/mrg/releases">MRG</ulink>,
<ulink url="https://www.khronos.org/opencl/">OpenCL</ulink> (for tests), and
<ulink url="http://www.openexr.org">OpenEXR</ulink>
<ulink url="https://www.khronos.org/opencl/">OpenCL</ulink> (for tests),
<ulink url="http://www.openexr.org">OpenEXR</ulink>, and
<ulink url="&w3m-url;">W3m</ulink>
</para>
<para condition="html" role="usernotes">

View File

@ -41,6 +41,16 @@
</itemizedlist>
</listitem>
-->
<listitem>
<para>April 20th, 2019</para>
<itemizedlist>
<listitem>
<para>[pierre] - Archive W3m and allow Linux-pam documentation to
be generated with lynx.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>April 19th, 2019</para>
<itemizedlist>

View File

@ -92,7 +92,7 @@
<para role="optional">
<xref linkend="libxslt"/> and either
<xref linkend="lynx"/>,
<xref linkend="w3m"/>, or
<ulink url="&w3m-url;">W3m</ulink>, or
<ulink url="&elinks-url;">ELinks</ulink>
</para>

View File

@ -31,6 +31,6 @@ $Date$
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="links.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lynx.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="w3m.xml"/>
<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="w3m.xml"/>-->
</chapter>

View File

@ -113,9 +113,8 @@
<xref linkend="docbook-xsl"/>,
<xref linkend="fop"/>,
<xref linkend="libxslt"/> and either
<xref linkend="w3m"/> or
<ulink url="&elinks-url;">elinks</ulink> (but with a link calling it
'<application>links</application>') and remove the documentation switch.
<xref linkend="lynx"/> or
<ulink url="&w3m-url;">W3m</ulink>
</para>
<para condition="html" role="usernotes">User Notes:
@ -133,6 +132,15 @@
<screen><userinput>tar -xf ../Linux-PAM-&linux-pam-docs-version;-docs.tar.bz2 --strip-components=1</userinput></screen>
<para>
If you instead want to regenerate the documentation, fix the
<command>configure</command> script so that it detects lynx if installed:
</para>
<screen><userinput>sed -e 's/dummy links/dummy lynx/' \
-e 's/-no-numbering -no-references/-force-html -nonumbers -stdin/' \
-i configure</userinput></screen>
<para>
Install <application>Linux PAM</application> by
running the following commands:
@ -141,7 +149,6 @@
<screen><userinput>./configure --prefix=/usr \
--sysconfdir=/etc \
--libdir=/usr/lib \
--disable-regenerate-docu \
--enable-securedir=/lib/security \
--docdir=/usr/share/doc/Linux-PAM-&linux-pam-version; &amp;&amp;
make</userinput></screen>
@ -227,12 +234,14 @@ done</userinput></screen>
</para>
<para>
<parameter>--disable-regenerate-docu</parameter> : This switch prevents
this version of the package trying to build its documentation, and failing,
if the required dependencies <emphasis>except</emphasis>
<xref linkend="w3m"/> are present, but <xref linkend="Links"/> is present.
Remove this switch if you have installed w3m (or elinks, with a link so it
can be invoked as 'links').
<option>--disable-regenerate-docu</option> : If the needed dependencies
(<xref linkend="DocBook"/>, <xref linkend="docbook-xsl"/>, <xref
linkend="libxslt"/>, and <xref linkend="lynx"/> or <ulink
url="&w3m-url;">W3m</ulink>) are installed, the manual pages, and the
html and text documentations are (re)generated and installed.
Furthermore, if <xref linkend="fop"/> is installed, the PDF
documentation is generated and installed. Use this switch if you do not
want to rebuild the documentation.
</para>
<para>

View File

@ -84,7 +84,8 @@
texinfo), and
<xref role="runtime" linkend="lynx"/> or
<xref role="runtime" linkend="Links"/> or
<xref role="runtime" linkend="w3m"/> (for conversion to ASCII text)
<ulink role="runtime" url="&w3m-url;">W3m</ulink>
(for conversion to ASCII text)
</para>
<para condition="html" role="usernotes">User Notes:

View File

@ -83,7 +83,7 @@
One of
<xref role="runtime" linkend="Links"/>,
<xref role="runtime" linkend="lynx"/>,
<xref role="runtime" linkend="w3m"/>, or
<ulink url="&w3m-url;">W3m</ulink>, or
<ulink url="&elinks-url;">ELinks</ulink>
</para>

View File

@ -161,7 +161,7 @@
following: <xref linkend="fop"/>,
<xref linkend="Links"/>,
<xref linkend="lynx"/>,
and <xref linkend="w3m"/> (to generate additional PDF or text
and <ulink url="&w3m-url;">W3m</ulink> (to generate additional PDF or text
documentation for the libXfont package).</para>
<para condition="html" role="usernotes">User Notes:

View File

@ -78,8 +78,8 @@
<para role="required">
<xref linkend="xmlto"/> with one of
<xref linkend="lynx"/>,
<xref linkend="w3m"/>, or
<xref linkend="Links"/>
<xref linkend="Links"/>, or
<ulink url="&w3m-url;">W3m</ulink>
</para>
<bridgehead renderas="sect4">Required (runtime)</bridgehead>