From c36301e75aefde449b6ab9a0fb2717ff1d5c2963 Mon Sep 17 00:00:00 2001
From: Ken Moffat <ken@linuxfromscratch.org>
Date: Wed, 9 Jun 2021 18:49:02 +0100
Subject: [PATCH 1/2] For consistency, install iproute2 progs in /usr/sbin

(merged /usr) - from Joe Locash.
---
 chapter01/changelog.xml | 10 ++++++++++
 chapter08/iproute2.xml  |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 5cbc2f5fa..c49be95cc 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,6 +42,16 @@
     <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] - Install iproute2 programs in /usr/sbin for
+          consistency.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem revision="sysv">
       <para>2021-06-08</para>
       <itemizedlist>
diff --git a/chapter08/iproute2.xml b/chapter08/iproute2.xml
index cf2065fb3..9d6a0c264 100644
--- a/chapter08/iproute2.xml
+++ b/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>
 

From 9c3ce2ac8b15a4e00d26be4ee4345534b43db2b5 Mon Sep 17 00:00:00 2001
From: Ken Moffat <ken@linuxfromscratch.org>
Date: Wed, 9 Jun 2021 19:34:33 +0100
Subject: [PATCH 2/2] For consistency, make the cpp link in /usr/lib.

---
 chapter01/changelog.xml | 4 ++++
 chapter08/gcc.xml       | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index c49be95cc..d87118062 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -45,6 +45,10 @@
     <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>
diff --git a/chapter08/gcc.xml b/chapter08/gcc.xml
index 6b5163fce..a4d4a8355 100644
--- a/chapter08/gcc.xml
+++ b/chapter08/gcc.xml
@@ -167,7 +167,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>