From 080aa9f1649617dc2ff0c539e4ea58468acd110d Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Wed, 5 Jan 2011 00:10:26 +0000
Subject: [PATCH] Tweaks to Xz instructions

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9437 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 appendices/dependencies.xml |  4 ++--
 chapter01/changelog.xml     | 11 +++++++++++
 chapter05/xz-utils.xml      |  2 +-
 chapter06/chapter06.xml     |  2 +-
 chapter06/xz-utils.xml      |  4 ++--
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index 1cf1930bb..a2895e18e 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -1233,7 +1233,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Bzip2, Coreutils, Flex, GCC, GDBM, Gettext,
-         Glibc, Grep, Groff, Gzip, Less, Make, and Sed</seg>
+         Glibc, Grep, Groff, Gzip, Less, Make, Sed, and Xz</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -2036,7 +2036,7 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>Man-DB</seg>
         </seglistitem>
       </segmentedlist>
 
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 3aff6f1c7..ab9d85bbb 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,17 @@
     </listitem>
 
 -->
+    <listitem>
+      <para>2011-01-04</para>
+      <itemizedlist>
+         <listitem>
+          <para>[bdubbs] Move XZ-Utils to before Man-DB.
+          Tweak install instructions.
+          </para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2011-01-02</para>
       <itemizedlist>
diff --git a/chapter05/xz-utils.xml b/chapter05/xz-utils.xml
index 5b5a7b05f..434533ebc 100644
--- a/chapter05/xz-utils.xml
+++ b/chapter05/xz-utils.xml
@@ -59,7 +59,7 @@
 
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make PREFIX=/tools install</userinput></screen>
+<screen><userinput remap="install">make install</userinput></screen>
 
   </sect2>
 
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 96eba60a9..dead9c2fd 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -60,6 +60,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="make.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xz-utils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-db.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module-init-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="patch.xml"/>
@@ -71,7 +72,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xz-utils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutdebug.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="strippingagain.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="revisedchroot.xml"/>
diff --git a/chapter06/xz-utils.xml b/chapter06/xz-utils.xml
index 6b354d345..f60bf5865 100644
--- a/chapter06/xz-utils.xml
+++ b/chapter06/xz-utils.xml
@@ -46,7 +46,7 @@
 
     <para>Prepare Xz for compilation with:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
 
     <para>Compile the package:</para>
 
@@ -78,7 +78,7 @@
         xzdec, xzdiff, xzegrep (link to xzgrep), xzfgrep (link to xzgrep),
         xzgrep, xzless, xzmore</seg>
         <seg>liblzma.{a,so}</seg>
-        <seg>/usr/include/lzma and /usr/share/doc/xz</seg>
+        <seg>/usr/include/lzma and /usr/share/doc/xz-&xz-version;</seg>
       </seglistitem>
     </segmentedlist>