From bb0c3b3a288055a3b15c41bf81cb4fbf71b6700d Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Sat, 11 Feb 2012 15:25:45 +0000
Subject: Correct some role related markup to help with jhalfs' package
 management feature.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9742 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml     | 5 +++++
 chapter05/linux-headers.xml | 6 +++---
 chapter06/linux-headers.xml | 6 +++---
 chapter06/mpfr.xml          | 4 ++--
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index d847ca95e..34c0fb760 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,11 @@
     <listitem>
       <para>2012-02-11</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Correct some markup for a couple of installation
+          commands. This helps with jhalfs' package management feature.  Thanks
+          to Pierre Labastie for the patch.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Create /usr/lib/libstdc++.la early in chapter 6 to
           fix an ICA issue.  Thanks to Pierre Labastie for the patch.</para>
diff --git a/chapter05/linux-headers.xml b/chapter05/linux-headers.xml
index 83e01607c..04340f80c 100644
--- a/chapter05/linux-headers.xml
+++ b/chapter05/linux-headers.xml
@@ -51,16 +51,16 @@
     <para>Make sure there are no stale files and dependencies lying around
     from previous activity:</para>
 
-<screen><userinput remap="install">make mrproper</userinput></screen>
+<screen><userinput remap="pre">make mrproper</userinput></screen>
 
     <para>Now test and extract the user-visible kernel headers from the source.
     They are placed in an intermediate local directory and copied to the needed
     location because the extraction process removes any existing files in 
     the target directory.</para>
 
-<screen><userinput remap="install">make headers_check
+<screen><userinput remap="make">make headers_check
 make INSTALL_HDR_PATH=dest headers_install
-cp -rv dest/include/* /tools/include</userinput></screen>
+</userinput><userinput remap="install">cp -rv dest/include/* /tools/include</userinput></screen>
 
   </sect2>
 
diff --git a/chapter06/linux-headers.xml b/chapter06/linux-headers.xml
index cb89fc1a0..ea1959794 100644
--- a/chapter06/linux-headers.xml
+++ b/chapter06/linux-headers.xml
@@ -50,7 +50,7 @@
     <para>Make sure there are no stale files and dependencies lying around
     from previous activity:</para>
 
-<screen><userinput remap="install">make mrproper</userinput></screen>
+<screen><userinput remap="pre">make mrproper</userinput></screen>
 
     <para>Now test and extract the user-visible kernel headers from the source.
     They are placed in an intermediate local directory and copied to the needed
@@ -59,10 +59,10 @@
     the kernel developers and not needed by LFS that are removed from
     the intermediate directory.</para>
 
-<screen><userinput remap="install">make headers_check
+<screen><userinput remap="make">make headers_check
 make INSTALL_HDR_PATH=dest headers_install
 find dest/include \( -name .install -o -name ..install.cmd \) -delete
-cp -rv dest/include/* /usr/include</userinput></screen>
+</userinput><userinput remap="install">cp -rv dest/include/* /usr/include</userinput></screen>
 
   </sect2>
 
diff --git a/chapter06/mpfr.xml b/chapter06/mpfr.xml
index b61697bb1..fe183fb7d 100644
--- a/chapter06/mpfr.xml
+++ b/chapter06/mpfr.xml
@@ -69,8 +69,8 @@
 
     <para>Install the documentation:</para>
 
-<screen><userinput remap="install">make html
-make install-html</userinput></screen>
+<screen><userinput remap="make">make html
+</userinput><userinput remap="install">make install-html</userinput></screen>
 
   </sect2>
 
-- 
cgit v1.2.3-54-g00ecf