From bbadc6d92b480054559e30722a0e60ba78bde257 Mon Sep 17 00:00:00 2001
From: Krejzi <krejzi@linuxfromscratch.org>
Date: Mon, 17 Feb 2014 17:40:52 +0000
Subject: [PATCH] Merge latest LFS updates, remove Bruce from the list of
 editors per his request.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10477 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/automake.xml     | 7 ++-----
 chapter06/creatingdirs.xml | 4 +---
 chapter06/flex.xml         | 2 +-
 prologue/bookinfo.xml      | 2 +-
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/chapter06/automake.xml b/chapter06/automake.xml
index e4c862f4e..d02700a27 100644
--- a/chapter06/automake.xml
+++ b/chapter06/automake.xml
@@ -55,11 +55,8 @@
     systems with only one processor due to internal delays in individual
     tests.  To test the results, issue:</para>
 
-<screen><userinput remap="test">mv -v /usr/lib/libfl.{so,save}
-ln -sv libfl.a /usr/lib/libfl.so
-make -j4 check
-rm -v /usr/lib/libfl.so
-mv -v /usr/lib/libfl.{save,so}</userinput></screen>
+<screen><userinput remap="test">sed -i "s:./configure:LEXLIB=/usr/lib/libfl.a &amp;:" t/lex-{clean,depend}-cxx.sh
+make -j4 check</userinput></screen>
 
     <para>Install the package:</para>
 
diff --git a/chapter06/creatingdirs.xml b/chapter06/creatingdirs.xml
index 9a3713ebf..5443326a9 100644
--- a/chapter06/creatingdirs.xml
+++ b/chapter06/creatingdirs.xml
@@ -20,10 +20,8 @@ install -dv -m 1777 /tmp /var/tmp
 mkdir -pv /usr/{,local/}{bin,include,lib,sbin,src}
 mkdir -pv /usr/{,local/}share/{color,dict,doc,info,locale,man}
 mkdir -v  /usr/{,local/}share/{misc,terminfo,zoneinfo}
+mkdir -v  /usr/libexec
 mkdir -pv /usr/{,local/}share/man/man{1..8}
-for dir in /usr /usr/local; do
-  ln -sv share/{man,doc,info} $dir
-done
 case $(uname -m) in
  x86_64) ln -sv lib /lib64 &amp;&amp; ln -sv lib /usr/lib64 &amp;&amp; ln -sv lib /usr/local/lib64 ;;
 esac
diff --git a/chapter06/flex.xml b/chapter06/flex.xml
index 45364de3f..6b4d42363 100644
--- a/chapter06/flex.xml
+++ b/chapter06/flex.xml
@@ -47,7 +47,7 @@
 
     <para>Prepare Flex for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr    \
+<screen><userinput remap="configure">./configure --prefix=/usr \
             --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
 
     <para>Compile the package:</para>
diff --git a/prologue/bookinfo.xml b/prologue/bookinfo.xml
index 5d95c53c5..40d0c5f10 100644
--- a/prologue/bookinfo.xml
+++ b/prologue/bookinfo.xml
@@ -17,7 +17,7 @@
     </author>
     <author>
       <firstname>Edited by Matthew Burgess</firstname>
-      <surname>and Bruce Dubbs</surname>
+      <surname>and Armin K.</surname>
     </author>
   </authorgroup>