usr-move: another batch of configure switches cleanup

10 files changed, 17 insertions, 58 deletions

diff --git a/chapter07/util-linux.xml b/chapter07/util-linux.xml
index 2c81aaece..8295d0d8e 100644
--- a/chapter07/util-linux.xml
+++ b/chapter07/util-linux.xml
@@ -52,6 +52,7 @@
     <para>Prepare Util-linux for compilation:</para>
 
 <screen><userinput remap="configure">./configure ADJTIME_PATH=/var/lib/hwclock/adjtime    \
+            --libdir=/usr/lib    \
             --docdir=/usr/share/doc/util-linux-&util-linux-version; \
             --disable-chfn-chsh  \
             --disable-login      \
@@ -79,6 +80,16 @@
       </varlistentry>
 
       <varlistentry>
+        <term><parameter>--libdir=/usr/lib</parameter></term>
+        <listitem>
+          <para>This switch ensures the
+          <filename class="extension">.so</filename> symlinks targeting
+          the shared library file in the same directory
+          (<filename class="directory">/usr/lib</filename>) directly.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
         <term><parameter>--disable-*</parameter></term>
         <listitem>
           <para>These switches prevent warnings about building components
diff --git a/chapter08/acl.xml b/chapter08/acl.xml
index 35aa40d4a..48bf73a75 100644
--- a/chapter08/acl.xml
+++ b/chapter08/acl.xml
@@ -44,15 +44,8 @@
 
     <para>Prepare Acl for compilation:</para>
 
-<screen revision="sysv"><userinput remap="configure">./configure --prefix=/usr         \
-            --bindir=/bin         \
+<screen><userinput remap="configure">./configure --prefix=/usr         \
             --disable-static      \
-            --libexecdir=/usr/lib \
-            --docdir=/usr/share/doc/acl-&acl-version;</userinput></screen>
-
-<screen revision="systemd"><userinput remap="configure">./configure --prefix=/usr         \
-            --disable-static      \
-            --libexecdir=/usr/lib \
             --docdir=/usr/share/doc/acl-&acl-version;</userinput></screen>
 
     <para>Compile the package:</para>
diff --git a/chapter08/attr.xml b/chapter08/attr.xml
index 29d2fb13a..122781f27 100644
--- a/chapter08/attr.xml
+++ b/chapter08/attr.xml
@@ -43,13 +43,7 @@
 
     <para>Prepare Attr for compilation:</para>
 
-<screen revision="sysv"><userinput remap="configure">./configure --prefix=/usr     \
-            --bindir=/bin     \
-            --disable-static  \
-            --sysconfdir=/etc \
-            --docdir=/usr/share/doc/attr-&attr-version;</userinput></screen>
-
-<screen revision="systemd"><userinput remap="configure">./configure --prefix=/usr     \
+<screen><userinput remap="configure">./configure --prefix=/usr     \
             --disable-static  \
             --sysconfdir=/etc \
             --docdir=/usr/share/doc/attr-&attr-version;</userinput></screen>
diff --git a/chapter08/e2fsprogs.xml b/chapter08/e2fsprogs.xml
index 40544e782..d7ff53a82 100644
--- a/chapter08/e2fsprogs.xml
+++ b/chapter08/e2fsprogs.xml
@@ -53,8 +53,6 @@ cd       build</userinput></screen>
     <para>Prepare e2fsprogs for compilation:</para>
 
 <screen><userinput remap="configure">../configure --prefix=/usr           \
-             --bindir=/bin           \
-             --with-root-prefix=""   \
              --enable-elf-shlibs     \
              --disable-libblkid      \
              --disable-libuuid       \
@@ -65,21 +63,6 @@ cd       build</userinput></screen>
       <title>The meaning of the configure options:</title>
 
       <varlistentry>
-        <term><parameter>--with-root-prefix=""</parameter> and
-              <parameter>--bindir=/bin</parameter></term>
-        <listitem>
-          <para>Certain programs (such as the <command>e2fsck</command>
-          program) are considered essential programs.  When, for example,
-          <filename class="directory">/usr</filename> is not mounted, these
-          programs still need to be available. They belong in directories
-          like <filename class="directory">/lib</filename> and <filename
-          class="directory">/sbin</filename>. If this option is not passed
-          to configure, the programs are installed into the
-          <filename class="directory">/usr</filename> directory.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
         <term><parameter>--enable-elf-shlibs</parameter></term>
         <listitem>
           <para>This creates the shared libraries which some programs
diff --git a/chapter08/eudev.xml b/chapter08/eudev.xml
index 39c86ef1f..6a4ff7a71 100644
--- a/chapter08/eudev.xml
+++ b/chapter08/eudev.xml
@@ -53,13 +53,7 @@
     <para>Prepare Eudev for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr           \
-            --bindir=/sbin          \
-            --sbindir=/sbin         \
-            --libdir=/usr/lib       \
             --sysconfdir=/etc       \
-            --libexecdir=/lib       \
-            --with-rootprefix=      \
-            --with-rootlibdir=/lib  \
             --enable-manpages       \
             --disable-static</userinput></screen>
 
diff --git a/chapter08/kmod.xml b/chapter08/kmod.xml
index 634e3e967..4f454ff69 100644
--- a/chapter08/kmod.xml
+++ b/chapter08/kmod.xml
@@ -44,7 +44,6 @@
     <para>Prepare Kmod for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr          \
-            --bindir=/bin          \
             --sysconfdir=/etc      \
             --with-xz              \
             --with-zstd            \
diff --git a/chapter08/libelf.xml b/chapter08/libelf.xml
index 41e1ae476..3465531a1 100644
--- a/chapter08/libelf.xml
+++ b/chapter08/libelf.xml
@@ -48,8 +48,7 @@
 
     <screen><userinput remap="configure">./configure --prefix=/usr                \
             --disable-debuginfod         \
-            --enable-libdebuginfod=dummy \
-            --libdir=/lib</userinput></screen>
+            --enable-libdebuginfod=dummy</userinput></screen>
 
     <para>Compile the package:</para>
 
@@ -65,7 +64,7 @@
 
 <screen><userinput remap="install">make -C libelf install
 install -vm644 config/libelf.pc /usr/lib/pkgconfig
-rm /lib/libelf.a</userinput></screen>
+rm /usr/lib/libelf.a</userinput></screen>
 
   </sect2>
 
diff --git a/chapter08/procps.xml b/chapter08/procps.xml
index 60c9f0c48..8d49b60b4 100644
--- a/chapter08/procps.xml
+++ b/chapter08/procps.xml
@@ -51,15 +51,11 @@
     <para>Prepare procps-ng for compilation:</para>
 
 <screen revision="sysv"><userinput remap="configure">./configure --prefix=/usr                            \
-            --exec-prefix=                           \
-            --libdir=/usr/lib                        \
             --docdir=/usr/share/doc/procps-ng-&procps-ng-version; \
             --disable-static                         \
             --disable-kill</userinput></screen>
 
 <screen revision="systemd"><userinput remap="configure">./configure --prefix=/usr                            \
-            --exec-prefix=                           \
-            --libdir=/usr/lib                        \
             --docdir=/usr/share/doc/procps-ng-&procps-ng-version; \
             --disable-static                         \
             --disable-kill                           \
diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml
index 174c98297..19648944e 100644
--- a/chapter08/systemd.xml
+++ b/chapter08/systemd.xml
@@ -76,12 +76,8 @@ meson --prefix=/usr                 \
       -Ddefault-dnssec=no           \
       -Dfirstboot=false             \
       -Dinstall-tests=false         \
-      -Dkmod-path=/bin/kmod         \
       -Dldconfig=false              \
-      -Dmount-path=/bin/mount       \
-      -Dsulogin-path=/sbin/sulogin  \
       -Dsysusers=false              \
-      -Dumount-path=/bin/umount     \
       -Db_lto=false                 \
       -Drpmmacrosdir=no             \
       -Dhomed=false                 \
@@ -95,14 +91,6 @@ meson --prefix=/usr                 \
       <title>The meaning of the meson options:</title>
 
       <varlistentry>
-        <term><parameter>-D*-path=*</parameter></term>
-        <listitem>
-          <para>These switches provide the location of binaries needed by
-          systemd at runtime that have not yet been installed.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
         <term><parameter>-Ddefault-dnssec=no</parameter></term>
         <listitem>
           <para>This switch turns off the experimental DNSSEC support.</para>
diff --git a/chapter08/util-linux.xml b/chapter08/util-linux.xml
index a7d3d61f4..310705c1a 100644
--- a/chapter08/util-linux.xml
+++ b/chapter08/util-linux.xml
@@ -45,6 +45,7 @@
     <para>Prepare Util-linux for compilation:</para>
 
 <screen revision="sysv"><userinput remap="configure">./configure ADJTIME_PATH=/var/lib/hwclock/adjtime   \
+            --libdir=/usr/lib    \
             --docdir=/usr/share/doc/util-linux-&util-linux-version; \
             --disable-chfn-chsh  \
             --disable-login      \
@@ -60,6 +61,7 @@
             runstatedir=/run</userinput></screen>
 
 <screen revision="systemd"><userinput remap="configure">./configure ADJTIME_PATH=/var/lib/hwclock/adjtime   \
+            --libdir=/usr/lib    \
             --docdir=/usr/share/doc/util-linux-&util-linux-version; \
             --disable-chfn-chsh  \
             --disable-login      \