Changeset 6a038a0

Timestamp:

Mar 9, 2006, 11:23:12 AM (19 years ago)

Author:

Jim Gifford <clfs@…>

Children:

7cc2095

Parents:

14cc095

Message:

r2491@server (orig r1238): chris | 2006-03-09 08:05:53 -0800
Simplified iproute2 instructions

Files:

• final-system/common/iproute2.xml (modified) (2 diffs)
• final-system/multilib/iproute2.xml (modified) (3 diffs)
• general.ent (modified) (2 diffs)
• introduction/common/changelog.xml (modified) (1 diff)

final-system/common/iproute2.xml

@@ -45 +45 @@
 <screen os="s2"><userinput>sed -i '/^TARGETS/s@arpd@@g' misc/Makefile</userinput></screen>
 
-    <para os="a">Prepare IPRoute2 for compilation:</para>
-
-<screen os="b"><userinput>sh configure </userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make SBINDIR=/sbin</userinput></screen>
-
-    <variablelist os="e">
+    <para os="a">Compile the package:</para>
+
+<screen os="b"><userinput>make SBINDIR=/sbin</userinput></screen>
+
+    <variablelist os="c">
       <title>The meaning of the make option:</title>
 
@@ -67 +63 @@
     </variablelist>
 
-    <para os="f">This package does not come with a test suite.</para>
-
-    <para os="g">Install the package:</para>
-
-<screen os="h"><userinput>make SBINDIR=/sbin install</userinput></screen>
+    <para os="d">This package does not come with a test suite.</para>
+
+    <para os="e">Install the package:</para>
+
+<screen os="f"><userinput>make SBINDIR=/sbin install</userinput></screen>
 
   </sect2>

final-system/multilib/iproute2.xml

@@ -34 +34 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/iproute2.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+<screen os="b"><userinput>make CC="gcc ${BUILD64}" SBINDIR=/sbin</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -42 +40 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<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='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -52 +52 @@
     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>
 

general.ent

@@ -1 +1 @@
 <?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">
@@ -16 +16 @@
 <!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}]" -->

introduction/common/changelog.xml

@@ -38 +38 @@
 
     <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>