Some more fixes.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10479 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

4 files changed, 12 insertions, 21 deletions

diff --git a/chapter06/acl.xml b/chapter06/acl.xml
index 6f3328c3c..77645682c 100644
--- a/chapter06/acl.xml
+++ b/chapter06/acl.xml
@@ -53,7 +53,7 @@
 
     <para>Prepare Acl for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --libexecdir=/usr/lib</userinput></screen>
 
     <para>Compile the package:</para>
 
diff --git a/chapter06/dbus.xml b/chapter06/dbus.xml
index 6a2f1d7ce..9fae7b1aa 100644
--- a/chapter06/dbus.xml
+++ b/chapter06/dbus.xml
@@ -187,17 +187,6 @@ ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</useri
         </listitem>
       </varlistentry>
 
-      <varlistentry id="libdbus">
-        <term><filename class="libraryfile">libdbus-1</filename></term>
-        <listitem>
-          <para>Contains API functions used to communicate with the D-Bus
-          message bus.</para>
-          <indexterm zone="ch-system-dbus libdbus">
-            <primary sortas="c-libdbus">libdbus</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
     </variablelist>
 
   </sect2>
diff --git a/chapter06/libdbus.xml b/chapter06/libdbus.xml
index 712421e99..6958b2a47 100644
--- a/chapter06/libdbus.xml
+++ b/chapter06/libdbus.xml
@@ -50,11 +50,9 @@
 
     <para>Prepare Libdbus for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr \
+<screen><userinput remap="configure">./configure --prefix=/usr     \
             --sysconfdir=/etc \
-            --localstatedir=/var \
-            --libexecdir=/usr/lib/dbus-1.0 \
-            --disable-static</userinput></screen>
+            --localstatedir=/var</userinput></screen>
 
     <para>Compile the package:</para>
 
@@ -93,7 +91,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</useri
 
       <seglistitem>
         <seg>none</seg>
-        <seg>libdbus-1.so</seg>
+        <seg>libdbus-1.{a,so}</seg>
         <seg>/usr/include/dbus-1.0, /usr/lib/dbus-1.0</seg>
       </seglistitem>
     </segmentedlist>
@@ -103,12 +101,12 @@ ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</useri
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="libdbus-lib">
-        <term><filename class="libraryfile">libdbus-1.so</filename></term>
+      <varlistentry id="libdbus-1">
+        <term><filename class="libraryfile">libdbus-1</filename></term>
         <listitem>
           <para>Contains API functions used to communicate with the D-Bus
           message bus.</para>
-          <indexterm zone="ch-system-libdbus libdbus-lib">
+          <indexterm zone="ch-system-libdbus libdbus-1">
             <primary sortas="c-libdbus">libdbus</primary>
           </indexterm>
         </listitem>
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index 4fd5e209f..8bd9d5566 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -140,6 +140,10 @@ done</userinput></screen>
 
 <screen><userinput remap="install">mv -v /usr/lib/libnss_myhostname.so.2 /lib</userinput></screen>
 
+    <para>Remove an unnecessary directory:</para>
+
+<screen><userinput remap="install">rm -rfv /usr/lib/rpm</userinput></screen>
+
     <para>Create the Sysvinit compatibility symlinks, so Systemd is used
     as the default init system:</para>
 
@@ -180,7 +184,7 @@ ln -sfv ../lib/systemd/systemd /sbin/init</userinput></screen>
         <seg>/etc/binfmt.d, /etc/init.d, /etc/kernel, /etc/modules-load.d,
         /etc/sysctl.d, /etc/systemd, /etc/tmpfiles.d, /etc/udev,
         /etc/xdg/systemd, /lib/systemd, /lib/udev, /usr/include/systemd,
-        /usr/lib/binfmt.d, /usr/lib/kernel, /usr/lib/modules-load.d, /usr/lib/rpm,
+        /usr/lib/binfmt.d, /usr/lib/kernel, /usr/lib/modules-load.d,
         /usr/lib/sysctl.d, /usr/lib/systemd, /usr/lib/tmpfiles.d,
         /usr/share/doc/systemd-&systemd-version;, /usr/share/systemd,
         /var/lib/systemd, /var/log/journal</seg>