Automatic merge of trunk into multilib

chapter01/changelog.xml

@@ -44,6 +44,20 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     -->
+    <listitem>
+      <para>2021-06-09</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - For consistency, make the cpp link in /usr/lib.
+          </para>
+        </listitem>
+        <listitem>
+          <para>[ken] - Install iproute2 programs in /usr/sbin for
+          consistency.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem revision="sysv">
       <para>2021-06-08</para>
       <itemizedlist>

chapter08/gcc.xml

@@ -185,7 +185,7 @@ rm -rf /usr/lib/gcc/$(gcc -dumpmachine)/&gcc-version;/include-fixed/bits/</useri
     url="https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch03s09.html">FHS</ulink>
     for "historical" reasons.</para>
 
-<screen><userinput remap="install">ln -svr /usr/bin/cpp /lib</userinput></screen>
+<screen><userinput remap="install">ln -svr /usr/bin/cpp /usr/lib</userinput></screen>
   <!-- already done earlier
     <para>Many packages use the name <command>cc</command> to call the C
     compiler. To satisfy those packages, create a symlink:</para>

chapter08/iproute2.xml

@@ -75,7 +75,7 @@ rm -fv man/man8/arpd.8</userinput></screen>
 
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make install</userinput></screen>
+<screen><userinput remap="install">make SBINDIR=/usr/sbin install</userinput></screen>
 
     <para>If desired, install the documentation:</para>