From fc199db3af4c4688dcdb2130123e7999a56a2943 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Thu, 9 Nov 2017 16:35:09 +0000
Subject: [PATCH] Editorial changes to systemd page

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11328 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/systemd.xml | 50 +++++++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index 923b7a36f..ebc5fa416 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -43,29 +43,35 @@
     <para>Create a symlink to work around missing xsltproc:</para>
 
 <screen><userinput remap="pre">ln -s /tools/bin/true /usr/bin/xsltproc</userinput></screen>
+    <para>Set up the man pages:</para>
+
+<screen><userinput remap="pre">tar -xf ../systemd-man-pages-235.tar.xz</userinput></screen>
 
     <para>Prepare systemd for compilation:</para>
 
-    <screen><userinput remap="configure">
-LANG=en_US.UTF-8  meson --prefix=/usr                   \
-                        --sysconfdir /etc               \
-                        --localstatedir /var            \
-                        -Dblkid=true                    \
-                        -Dbuildtype=release             \
-                        -Ddefault-dnssec=no             \
-                        -Dfirstboot=false               \
-                        -Dkill-path=/bin/kill           \
-                        -Dkmod-path=/bin/kmod           \
-                        -Dldconfig=false                \
-                        -Dmount-path=/bin/mount         \
-                        -Drootprefix=                   \
-                        -Drootlibdir=/lib               \
-                        -Dsplit-usr=true                \
-                        -Dsulogin-path=/sbin/sulogin    \
-                        -Dsysusers=false                \
-                        -Dumount-path=/bin/umount       \
-                        -Db_lto=false                   \
-                        $PWD build</userinput></screen>
+    <screen><userinput remap="configure">mkdir build
+cd    build
+
+LANG=en_US.UTF-8                   \
+meson --prefix=/usr                \
+      --sysconfdir=/etc            \
+      --localstatedir=/var         \
+      -Dblkid=true                 \
+      -Dbuildtype=release          \
+      -Ddefault-dnssec=no          \
+      -Dfirstboot=false            \
+      -Dkill-path=/bin/kill        \
+      -Dkmod-path=/bin/kmod        \
+      -Dldconfig=false             \
+      -Dmount-path=/bin/mount      \
+      -Drootprefix=                \
+      -Drootlibdir=/lib            \
+      -Dsplit-usr=true             \
+      -Dsulogin-path=/sbin/sulogin \
+      -Dsysusers=false             \
+      -Dumount-path=/bin/umount    \
+      -Db_lto=false                \
+      ..</userinput></screen>
 
     <variablelist>
       <title>The meaning of the meson options:</title>
@@ -141,9 +147,7 @@ LANG=en_US.UTF-8  meson --prefix=/usr                   \
 
     <para>Compile the package:</para>
 
-<screen><userinput remap="make">tar -xf ../systemd-man-pages-&systemd-version;.tar.xz
-cd build
-LANG=en_US.UTF-8 ninja</userinput></screen>
+<screen><userinput remap="make">LANG=en_US.UTF-8 ninja</userinput></screen>
 <!--
     <para>To test the package, execute the following command:</para>