[lfs-book] r10477 - in branches/systemd/BOOK: chapter06 prologue

[krejzi]

Author: krejzi
Date: Mon Feb 17 09:40:52 2014
New Revision: 10477

Log:
Merge latest LFS updates, remove Bruce from the list of editors per his request.

Modified:
   branches/systemd/BOOK/chapter06/automake.xml
   branches/systemd/BOOK/chapter06/creatingdirs.xml
   branches/systemd/BOOK/chapter06/flex.xml
   branches/systemd/BOOK/prologue/bookinfo.xml

Modified: branches/systemd/BOOK/chapter06/automake.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/automake.xml        Sun Feb 16 20:59:10 
2014        (r10476)
+++ branches/systemd/BOOK/chapter06/automake.xml        Mon Feb 17 09:40:52 
2014        (r10477)
@@ -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>
 

Modified: branches/systemd/BOOK/chapter06/creatingdirs.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/creatingdirs.xml    Sun Feb 16 20:59:10 
2014        (r10476)
+++ branches/systemd/BOOK/chapter06/creatingdirs.xml    Mon Feb 17 09:40:52 
2014        (r10477)
@@ -20,10 +20,8 @@
 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

Modified: branches/systemd/BOOK/chapter06/flex.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/flex.xml    Sun Feb 16 20:59:10 2014        
(r10476)
+++ branches/systemd/BOOK/chapter06/flex.xml    Mon Feb 17 09:40:52 2014        
(r10477)
@@ -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>

Modified: branches/systemd/BOOK/prologue/bookinfo.xml
==============================================================================
--- branches/systemd/BOOK/prologue/bookinfo.xml Sun Feb 16 20:59:10 2014        
(r10476)
+++ branches/systemd/BOOK/prologue/bookinfo.xml Mon Feb 17 09:40:52 2014        
(r10477)
@@ -17,7 +17,7 @@
     </author>
     <author>
       <firstname>Edited by Matthew Burgess</firstname>
-      <surname>and Bruce Dubbs</surname>
+      <surname>and Armin K.</surname>
     </author>
   </authorgroup>
 
-- 
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page