Changeset 03e6a40 for BOOK/final-system/common/iproute2.xml

Timestamp:

Apr 20, 2014, 8:57:39 AM (12 years ago)

Author:

Chris Staub <chris@…>

Children:

0be79ea

Parents:

88ef769 (diff), 578ca586 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:

• BOOK/final-system/common/iproute2.xml (modified) (6 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
-rm -v man/man8/arpd.8</userinput></screen>
+sed -i 's/arpd.8//' man/man8/Makefile</userinput></screen>
 
     <para os="f1">Remove unused libnl headers:</para>
@@ -44 +44 @@
     <para os="a">Compile the package:</para>
 
-<screen os="b"><userinput>make DESTDIR= DOCDIR=/usr/share/doc/iproute2 \
-    MANDIR=/usr/share/man</userinput></screen>
+<screen os="b"><userinput>make DESTDIR= MANDIR=/usr/share/man</userinput></screen>
 
     <variablelist os="c">
@@ -60 +59 @@
         </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>
 
@@ -76 +65 @@
     <para os="e">Install the package:</para>
 
-<screen os="f"><userinput>make DESTDIR= DOCDIR=/usr/share/doc/iproute2 \
+<screen os="f"><userinput>make DESTDIR= DOCDIR=/usr/share/doc/iproute2-&iproute2-version; \
     MANDIR=/usr/share/man install</userinput></screen>
 
@@ -92 +81 @@
         nstat, routef, routel, rtacct, rtmon, rtpr, rtstat (link to lnstat), ss,
         and tc</seg>
-        <seg>/etc/iproute2, /lib/tc, /usr/lib/tc, /usr/share/doc/iproute2</seg>
+        <seg>/etc/iproute2, /usr/lib/tc,
+        /usr/share/doc/iproute2-&iproute2-version;</seg>
       </seglistitem>
     </segmentedlist>
@@ -183 +173 @@
           delete the multicast routing</para>
 
-          <para><command>ip monitor</command> allows users to continously monitor
+          <para><command>ip monitor</command> allows users to continuously monitor
           the state of devices, addresses and routes</para>
           <indexterm zone="ch-system-iproute2 ip">