Merge latest lfs svn work into systemd branch. Better to be safe than sorry.

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

10 files changed, 28 insertions, 40 deletions

diff --git a/chapter06/acl.xml b/chapter06/acl.xml
index ffe71b2e5..4da5e353b 100644
--- a/chapter06/acl.xml
+++ b/chapter06/acl.xml
@@ -60,10 +60,10 @@
 <screen><userinput remap="make">make</userinput></screen>
 
     <para>The Acl tests need to be run on a filesystem that supports access
-    controls. Coreutils needs to be compiled with ACL support in order for
-    the testsuite to complete successfully. To test the results, issue:</para>
-
-<screen><userinput remap="test">make tests</userinput></screen>
+    controls after <application>Coreutils</application> has been built with the
+    Acl libraries.  If desired, return to this package and run <command>make
+    tests</command> after <application>Coreutils</application> has been built
+    later in this chapter.</para>
 
     <para>Install the package:</para>
 
diff --git a/chapter06/attr.xml b/chapter06/attr.xml
index 6d1fdad45..69ac3ee81 100644
--- a/chapter06/attr.xml
+++ b/chapter06/attr.xml
@@ -59,8 +59,9 @@
 
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>The Attr tests need to be run on a filesystem that supports extended
-    attributes. To test the results, issue:</para>
+    <para>The tests need to be run on a filesystem that supports extended
+    attributes such as the ext2, ext3, or ext4 filesystems. To test the
+    results, issue:</para>
 
 <screen><userinput remap="test">make tests root-tests</userinput></screen>
 
diff --git a/chapter06/dbus.xml b/chapter06/dbus.xml
index ae06c4453..476baf41d 100644
--- a/chapter06/dbus.xml
+++ b/chapter06/dbus.xml
@@ -48,11 +48,11 @@
 
     <para>Prepare D-Bus for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr                      \
-            --sysconfdir=/etc                  \
-            --localstatedir=/var               \
-            --docdir=/usr/share/doc/dbus-&dbus-version; \
-            --with-console-auth-dir=/run/console/</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr                       \
+            --sysconfdir=/etc                   \
+            --localstatedir=/var                \
+            --docdir=/usr/share/doc/dbus-&dbus-version;  \
+            --with-console-auth-dir=/run/console</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index 9ca778a04..7aca00f9e 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -61,6 +61,7 @@ cd build</userinput></screen>
 CFLAGS=-I/tools/include              \
 PKG_CONFIG_PATH=/tools/lib/pkgconfig \
 ../configure --prefix=/usr           \
+             --bindir=/bin           \
              --with-root-prefix=""   \
              --enable-elf-shlibs     \
              --disable-libblkid      \
@@ -80,7 +81,8 @@ PKG_CONFIG_PATH=/tools/lib/pkgconfig \
       </varlistentry>
 
       <varlistentry>
-        <term><parameter>--with-root-prefix=""</parameter></term>
+        <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,
diff --git a/chapter06/flex.xml b/chapter06/flex.xml
index 28d50e9a9..8ad7040a9 100644
--- a/chapter06/flex.xml
+++ b/chapter06/flex.xml
@@ -70,19 +70,11 @@
 -->
     <para>A few programs do not know about <command>flex</command> yet and
     try to run its predecessor, <command>lex</command>. To support those
-    programs, create a wrapper script named <filename>lex</filename> that
-    calls <filename>flex</filename> in <command>lex</command> emulation
+    programs, create a symbolic link named <filename>lex</filename> that
+    runs <filename>flex</filename> in <command>lex</command> emulation
     mode:</para>
 
-<screen><userinput remap="install">cat &gt; /usr/bin/lex &lt;&lt; "EOF"
-<literal>#!/bin/sh
-# Begin /usr/bin/lex
-
-exec /usr/bin/flex -l "$@"
-
-# End /usr/bin/lex</literal>
-EOF
-chmod -v 755 /usr/bin/lex</userinput></screen>
+<screen><userinput remap="install">ln -s flex /usr/bin/lex</userinput></screen>
 
   </sect2>
 
@@ -95,7 +87,7 @@ chmod -v 755 /usr/bin/lex</userinput></screen>
       <segtitle>Installed directories</segtitle>
 
       <seglistitem>
-        <seg>flex, flex++ (link to flex), and lex</seg>
+        <seg>flex, flex++ (link to flex), and lex (link to flex)</seg>
         <seg>libfl.{a,so} and libfl_pic.{a,so}</seg>
         <seg>/usr/share/doc/flex-&flex-version;</seg>
       </seglistitem>
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 1484f4ff5..063e0146a 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -234,12 +234,16 @@ cd ../gcc-build</userinput></screen>
     href="adjusting.xml"
     xpointer="xpointer(//*[@os='k'])"/>
 
-<screen><computeroutput>SEARCH_DIR("/usr/i686-pc-linux-gnu/lib")
+<screen><computeroutput>SEARCH_DIR("/usr/i686-pc-linux-gnu/lib32")
+SEARCH_DIR("/usr/local/lib32")
+SEARCH_DIR("/lib32")
+SEARCH_DIR("/usr/lib32")
+SEARCH_DIR("/usr/i686-pc-linux-gnu/lib")
 SEARCH_DIR("/usr/local/lib")
 SEARCH_DIR("/lib")
 SEARCH_DIR("/usr/lib");</computeroutput></screen>
 
-   <para>A 64-bit system may see a few more directories. For example, here
+   <para>A 64-bit system may see a few different directories. For example, here
    is the output from an x86_64 machine:</para>
 
 <screen><computeroutput>SEARCH_DIR("/usr/x86_64-unknown-linux-gnu/lib64")
diff --git a/chapter06/kmod.xml b/chapter06/kmod.xml
index 7bbbbfa82..ca725c203 100644
--- a/chapter06/kmod.xml
+++ b/chapter06/kmod.xml
@@ -47,7 +47,6 @@
             --bindir=/bin          \
             --sysconfdir=/etc      \
             --with-rootlibdir=/lib \
-            --disable-manpages     \
             --with-xz              \
             --with-zlib</userinput></screen>
 
@@ -62,15 +61,6 @@
       </varlistentry>
 
       <varlistentry>
-        <term><parameter>--disable-manpages</parameter></term>
-        <listitem>
-          <para>This option prevents the man pages from being built, as they
-          rely on libxslt, which isn't available in the chroot
-          environment.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
         <term><parameter>--with-rootlibdir=/lib</parameter></term>
         <listitem>
           <para>This option ensures different library related files are placed 
@@ -93,7 +83,6 @@
     Linux kernel modules):</para>
 
 <screen><userinput remap="install">make install
-make -C man install
 
 for target in depmod insmod modinfo modprobe rmmod; do
   ln -sv ../bin/kmod /sbin/$target
diff --git a/chapter06/linux-headers.xml b/chapter06/linux-headers.xml
index 996fe9fdf..17b2694db 100644
--- a/chapter06/linux-headers.xml
+++ b/chapter06/linux-headers.xml
@@ -52,7 +52,7 @@
 
 <screen><userinput remap="pre">make mrproper</userinput></screen>
 
-    <para>Now test and extract the user-visible kernel headers from the source.
+    <para>Now extract the user-visible kernel headers from the source.
     They are placed in an intermediate local directory and copied to the needed
     location because the extraction process removes any existing files in
     the target directory.  There are also some hidden files used by
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index 1acc703cb..1229318fb 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -141,7 +141,7 @@ EOF</userinput></screen>
 <screen><userinput remap="test">make -k check</userinput></screen>
 
     <para>Note that some tests might fail because the test are being run in a
-    chroot environment. For full test coverage, the test suite should be ran
+    chroot environment. For full test coverage, the test suite should be run
     from a system booted using Systemd.</para>
 
     <para>Install the package:</para>
diff --git a/chapter06/xml-parser.xml b/chapter06/xml-parser.xml
index 2571e1a23..8a5e5b917 100644
--- a/chapter06/xml-parser.xml
+++ b/chapter06/xml-parser.xml
@@ -63,7 +63,7 @@
     <title>Contents of XML::Parser</title>
 
     <segmentedlist>
-      <segtitle>Installed Perl module</segtitle>
+      <segtitle>Installed module</segtitle>
 
       <seglistitem>
         <seg>Expat.so</seg>