Changes in BOOK/final-system/common/iproute2.xml [62f6590:1c57432]

File:

• BOOK/final-system/common/iproute2.xml (modified) (2 diffs)

BOOK/final-system/common/iproute2.xml

@@ -36 +36 @@
 <screen os="s2"><userinput>sed -i '/^TARGETS/s@arpd@@g' misc/Makefile
 sed -i '/ARPD/d' Makefile
-sed -i 's/arpd.8//' man/man8/Makefile</userinput></screen>
+rm -v man/man8/arpd.8</userinput></screen>
+
+    <para os="f1">Remove unused libnl headers:</para>
+    
+    <screen os="f2"><userinput>sed -i '/netlink\//d' ip/ipl2tp.c</userinput></screen>
 
     <para os="a">Compile the package:</para>
 
-<screen os="b"><userinput>make</userinput></screen>
-
-    <para os="c">This package does not come with a test suite.</para>
-
-    <para os="d">Install the package:</para>
-
-<screen os="e"><userinput>make DOCDIR=/usr/share/doc/iproute2-&iproute2-version; install</userinput></screen>
+<screen os="b"><userinput>make DESTDIR= DOCDIR=/usr/share/doc/iproute2 \
+    MANDIR=/usr/share/man</userinput></screen>
+
+    <variablelist os="c">
+      <title>The meaning of the make option:</title>
+
+      <varlistentry>
+        <term><parameter>DESTDIR=</parameter></term>
+        <listitem>
+          <para>This option overrides the default DESTDIR of /usr, so that
+          that the IPRoute2 binaries will be installed into
+          <filename class="directory">/sbin</filename>. This is the correct
+          location according to the FHS, because some of the IPRoute2 binaries
+          are used by the CLFS-Bootscripts package.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>DOCDIR=/usr/share/doc/iproute2 MANDIR=/usr/share/man</parameter></term>
+        <listitem>
+          <para>The DESTDIR=/ parameter would cause documentation to be
+          installed into <filename class="directory">/share/doc</filename> and
+          <filename class="directory">/share/man</filename>. These options
+          ensure the docs are installed to the correct locations.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
+    <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 DESTDIR= DOCDIR=/usr/share/doc/iproute2 \
+    MANDIR=/usr/share/man install</userinput></screen>
 
   </sect2>
@@ -61 +92 @@
         nstat, routef, routel, rtacct, rtmon, rtpr, rtstat (link to lnstat), ss,
         and tc</seg>
-        <seg>/etc/iproute2, /usr/lib/tc,
-        /usr/share/doc/iproute2-&iproute2-version;</seg>
+        <seg>/etc/iproute2, /lib/tc, /usr/lib/tc, /usr/share/doc/iproute2</seg>
       </seglistitem>
     </segmentedlist>