From 03682b250cfd625619e149be9476fa6b1d5cbbc7 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Thu, 14 Dec 2023 14:16:13 -0600
Subject: Reformat util-linux configure parameters.

---
 chapter01/changelog.xml  |  9 +++++++++
 chapter07/util-linux.xml |  8 ++++----
 chapter08/util-linux.xml | 10 +++++-----
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 11df22160..2cf1b64e1 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,15 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
 
+    <listitem revision='sysv'>
+      <para>2023-12-14</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Reformat util-linux configure parameters.  Fixes
+          <ulink url='&lfs-ticket-root;5395'>#5395</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
     <listitem>
       <para>2023-12-04</para>
       <itemizedlist>
diff --git a/chapter07/util-linux.xml b/chapter07/util-linux.xml
index 2f88e7d5f..b5aca7e7b 100644
--- a/chapter07/util-linux.xml
+++ b/chapter07/util-linux.xml
@@ -51,10 +51,8 @@
 
     <para>Prepare Util-linux for compilation:</para>
 
-<screen><userinput remap="configure">./configure ADJTIME_PATH=/var/lib/hwclock/adjtime    \
-            --libdir=/usr/lib    \
+<screen><userinput remap="configure">./configure --libdir=/usr/lib    \
             --runstatedir=/run   \
-            --docdir=/usr/share/doc/util-linux-&util-linux-version; \
             --disable-chfn-chsh  \
             --disable-login      \
             --disable-nologin    \
@@ -63,7 +61,9 @@
             --disable-runuser    \
             --disable-pylibmount \
             --disable-static     \
-            --without-python</userinput></screen>
+            --without-python     \
+            ADJTIME_PATH=/var/lib/hwclock/adjtime \
+            --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
diff --git a/chapter08/util-linux.xml b/chapter08/util-linux.xml
index a6d058aff..dc061bccf 100644
--- a/chapter08/util-linux.xml
+++ b/chapter08/util-linux.xml
@@ -48,8 +48,7 @@
 
     <para>Prepare Util-linux for compilation:</para>
 
-<screen revision="sysv"><userinput remap="configure">./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \
-            --bindir=/usr/bin    \
+<screen revision="sysv"><userinput remap="configure">./configure --bindir=/usr/bin    \
             --libdir=/usr/lib    \
             --runstatedir=/run   \
             --sbindir=/usr/sbin  \
@@ -63,11 +62,11 @@
             --disable-static     \
             --without-python     \
             --without-systemd    \
-            --without-systemdsystemunitdir \
+            --without-systemdsystemunitdir        \
+            ADJTIME_PATH=/var/lib/hwclock/adjtime \
             --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
 
-<screen revision="systemd"><userinput remap="configure">./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \
-            --bindir=/usr/bin    \
+<screen revision="systemd"><userinput remap="configure">./configure --bindir=/usr/bin    \
             --libdir=/usr/lib    \
             --runstatedir=/run   \
             --sbindir=/usr/sbin  \
@@ -80,6 +79,7 @@
             --disable-pylibmount \
             --disable-static     \
             --without-python     \
+            ADJTIME_PATH=/var/lib/hwclock/adjtime \
             --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
 
     <para>The --disable and --without options prevent warnings about
-- 
cgit v1.2.3-54-g00ecf