[lfs-book] r9742 - in trunk/BOOK: chapter01 chapter05 chapter06

matthew at linuxfromscratch.org matthew at linuxfromscratch.org
Sat Feb 11 07:25:50 PST 2012


Author: matthew
Date: 2012-02-11 08:25:45 -0700 (Sat, 11 Feb 2012)
New Revision: 9742

Modified:
   trunk/BOOK/chapter01/changelog.xml
   trunk/BOOK/chapter05/linux-headers.xml
   trunk/BOOK/chapter06/linux-headers.xml
   trunk/BOOK/chapter06/mpfr.xml
Log:
Correct some role related markup to help with jhalfs' package management feature.

Modified: trunk/BOOK/chapter01/changelog.xml
===================================================================
--- trunk/BOOK/chapter01/changelog.xml	2012-02-11 15:24:53 UTC (rev 9741)
+++ trunk/BOOK/chapter01/changelog.xml	2012-02-11 15:25:45 UTC (rev 9742)
@@ -41,6 +41,11 @@
       <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>
         </listitem>

Modified: trunk/BOOK/chapter05/linux-headers.xml
===================================================================
--- trunk/BOOK/chapter05/linux-headers.xml	2012-02-11 15:24:53 UTC (rev 9741)
+++ trunk/BOOK/chapter05/linux-headers.xml	2012-02-11 15:25:45 UTC (rev 9742)
@@ -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>
 

Modified: trunk/BOOK/chapter06/linux-headers.xml
===================================================================
--- trunk/BOOK/chapter06/linux-headers.xml	2012-02-11 15:24:53 UTC (rev 9741)
+++ trunk/BOOK/chapter06/linux-headers.xml	2012-02-11 15:25:45 UTC (rev 9742)
@@ -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>
 

Modified: trunk/BOOK/chapter06/mpfr.xml
===================================================================
--- trunk/BOOK/chapter06/mpfr.xml	2012-02-11 15:24:53 UTC (rev 9741)
+++ trunk/BOOK/chapter06/mpfr.xml	2012-02-11 15:25:45 UTC (rev 9742)
@@ -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>
 




More information about the lfs-book mailing list