r1238 - in trunk/BOOK: . final-system/common final-system/multilib introduction/common

chris at linuxfromscratch.org chris at linuxfromscratch.org
Thu Mar 9 08:05:54 PST 2006


Author: chris
Date: 2006-03-09 09:05:53 -0700 (Thu, 09 Mar 2006)
New Revision: 1238

Modified:
   trunk/BOOK/final-system/common/iproute2.xml
   trunk/BOOK/final-system/multilib/iproute2.xml
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/common/changelog.xml
Log:
Simplified iproute2 instructions

Modified: trunk/BOOK/final-system/common/iproute2.xml
===================================================================
--- trunk/BOOK/final-system/common/iproute2.xml	2006-03-09 16:03:21 UTC (rev 1237)
+++ trunk/BOOK/final-system/common/iproute2.xml	2006-03-09 16:05:53 UTC (rev 1238)
@@ -44,15 +44,11 @@
 
 <screen os="s2"><userinput>sed -i '/^TARGETS/s at arpd@@g' misc/Makefile</userinput></screen>
 
-    <para os="a">Prepare IPRoute2 for compilation:</para>
+    <para os="a">Compile the package:</para>
 
-<screen os="b"><userinput>sh configure </userinput></screen>
+<screen os="b"><userinput>make SBINDIR=/sbin</userinput></screen>
 
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make SBINDIR=/sbin</userinput></screen>
-
-    <variablelist os="e">
+    <variablelist os="c">
       <title>The meaning of the make option:</title>
 
       <varlistentry>
@@ -66,11 +62,11 @@
       </varlistentry>
     </variablelist>
 
-    <para os="f">This package does not come with a test suite.</para>
+    <para os="d">This package does not come with a test suite.</para>
 
-    <para os="g">Install the package:</para>
+    <para os="e">Install the package:</para>
 
-<screen os="h"><userinput>make SBINDIR=/sbin install</userinput></screen>
+<screen os="f"><userinput>make SBINDIR=/sbin install</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/multilib/iproute2.xml
===================================================================
--- trunk/BOOK/final-system/multilib/iproute2.xml	2006-03-09 16:03:21 UTC (rev 1237)
+++ trunk/BOOK/final-system/multilib/iproute2.xml	2006-03-09 16:05:53 UTC (rev 1238)
@@ -33,16 +33,16 @@
     href="../common/iproute2.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
+<screen os="b"><userinput>make CC="gcc ${BUILD64}" SBINDIR=/sbin</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/iproute2.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/iproute2.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
-<screen os="d"><userinput>make CC="gcc ${BUILD64}" SBINDIR=/sbin</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/iproute2.xml"
     xpointer="xpointer(//*[@os='e'])"/>
@@ -51,14 +51,6 @@
     href="../common/iproute2.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/iproute2.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/iproute2.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2006-03-09 16:03:21 UTC (rev 1237)
+++ trunk/BOOK/general.ent	2006-03-09 16:05:53 UTC (rev 1238)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!ENTITY version "CLFS-SVN-20060306">
+<!ENTITY version "CLFS-SVN-20060309">
 <!ENTITY version-x86 "&version;-x86">
 <!ENTITY version-x86_64 "&version;-x86_64-Multilib">
 <!ENTITY version-x86_64-64 "&version;-x86_64-Pure64">
@@ -15,7 +15,7 @@
 <!ENTITY version-mips64-64 "&version;-MIPS64-Pure64">
 <!ENTITY version-alpha "&version;-ALPHA">
 
-<!ENTITY releasedate "March 6, 2006">
+<!ENTITY releasedate "March 9, 2006">
 <!ENTITY milestone "0.1">
 <!ENTITY generic-version "svn"> <!-- Use "svn", "testing", or "x.y[-pre{x}]" -->
 

Modified: trunk/BOOK/introduction/common/changelog.xml
===================================================================
--- trunk/BOOK/introduction/common/changelog.xml	2006-03-09 16:03:21 UTC (rev 1237)
+++ trunk/BOOK/introduction/common/changelog.xml	2006-03-09 16:05:53 UTC (rev 1238)
@@ -37,6 +37,16 @@
 -->
 
     <listitem>
+      <para>March 9, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Simplified IPRoute2 instruction by removing
+                redundant "configure" command.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>March 2, 2006</para>
       <itemizedlist>
         <listitem>




More information about the cross-lfs mailing list