aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Burgess <matthew@linuxfromscratch.org>2009-06-29 20:03:59 +0000
committerMatthew Burgess <matthew@linuxfromscratch.org>2009-06-29 20:03:59 +0000
commit94e69545480652dc592f78f3fe42142a4699a9a4 (patch)
tree3caa4122c387270ef8195736d88df16b34954d25
parentd092e9c0f2a16a04459a4a69b11b890f4373aad0 (diff)
Fix the generation of Sed's HTML documentation. Fixes #2422.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8954 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml5
-rw-r--r--chapter06/sed.xml15
2 files changed, 17 insertions, 3 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 2959ea927..80538ceea 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,11 @@
<para>2009-06-29</para>
<itemizedlist>
<listitem>
+ <para>[matthew] - Fixed the generation of the HTML documentation for
+ Sed. Thanks to Chris Staub for the report and patch. Fixes
+ <ulink url="&lfs-ticket-root;2422">#2422</ulink>.</para>
+ </listitem>
+ <listitem>
<para>[matthew] - Added upstream Readline patches. Fixes
<ulink url="&lfs-ticket-root;2426">#2426</ulink>.</para>
</listitem>
diff --git a/chapter06/sed.xml b/chapter06/sed.xml
index ce5a9ff75..d95e74858 100644
--- a/chapter06/sed.xml
+++ b/chapter06/sed.xml
@@ -42,15 +42,16 @@
<para>Prepare Sed for compilation:</para>
-<screen><userinput remap="configure">./configure --prefix=/usr --bindir=/bin --enable-html</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --bindir=/bin --htmldir=/usr/share/doc/sed-&sed-version;</userinput></screen>
<variablelist>
<title>The meaning of the new configure option:</title>
<varlistentry>
- <term><parameter>--enable-html</parameter></term>
+ <term><parameter>--htmldir</parameter></term>
<listitem>
- <para>This builds the HTML documentation.</para>
+ <para>This sets the directory where the HTML documentation will be
+ installed to.</para>
</listitem>
</varlistentry>
</variablelist>
@@ -59,6 +60,10 @@
<screen><userinput remap="make">make</userinput></screen>
+ <para>Generate the HTML documentation:</para>
+
+<screen><userinput remap="make">make html</userinput></screen>
+
<para>To test the results, issue:</para>
<screen><userinput remap="test">make check</userinput></screen>
@@ -67,6 +72,10 @@
<screen><userinput remap="install">make install</userinput></screen>
+ <para>Install the HTML documentation:</para>
+
+<screen><userinput remap="install">make -C doc install-html</userinput></screen>
+
</sect2>
<sect2 id="contents-sed" role="content">