aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06
diff options
context:
space:
mode:
authorJeremy Huntwork <jhuntwork@linuxfromscratch.org>2006-05-25 14:01:00 +0000
committerJeremy Huntwork <jhuntwork@linuxfromscratch.org>2006-05-25 14:01:00 +0000
commite6c8119c856fd132496ee137167ce16d90baddbf (patch)
tree4a3aaa2f66765ed88d3d2fc9aa76e3ae97cce0fe /chapter06
parent3202348d66a4f1be6499849d74020bdd5012b265 (diff)
Fixed generation of diff's man page, fixes #1800.
Thanks Randy McMurchy for the report and Ken Moffat for the fix. Also, some slight wording adjustments on the Shadow page. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@7627 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter06')
-rw-r--r--chapter06/diffutils.xml8
-rw-r--r--chapter06/shadow.xml3
2 files changed, 9 insertions, 2 deletions
diff --git a/chapter06/diffutils.xml b/chapter06/diffutils.xml
index 3c55e77b6..855c7d418 100644
--- a/chapter06/diffutils.xml
+++ b/chapter06/diffutils.xml
@@ -41,6 +41,14 @@
<screen><userinput>patch -Np1 -i ../&diffutils-i18n-patch;</userinput></screen>
+ <para>The above patch will cause the Diffutils build system to attempt to
+ rebuild the <filename>diff.1</filename> man page using the unavailable
+ program <command>help2man</command>. The result is an unreadable man page for
+ <command>diff</command>. We can avoid this by updating the timestamp on
+ the file <filename>man/diff.1</filename>:</para>
+
+<screen><userinput>touch man/diff.1</userinput></screen>
+
<para>Prepare Diffutils for compilation:</para>
<screen><userinput>./configure --prefix=/usr</userinput></screen>
diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml
index 626335673..cb606490b 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -131,8 +131,7 @@ convert-mans UTF-8 ISO-8859-9 man/tr/*.?</userinput></screen>
etc/login.defs &gt; /etc/login.defs</userinput></screen>
<note>
- <para>If you built Shadow with Cracklib support, insert the following into
- the <command>sed</command> given below:</para>
+ <para>If you built Shadow with Cracklib support, run the following:</para>
<screen><literal>sed -i 's@DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@' /etc/login.defs</literal></screen>
</note>