Changeset bbadc6d for chapter06

Timestamp:

02/17/2014 05:40:52 PM (11 years ago)

Author:

Krejzi <krejzi@…>

Branches:

7.5-systemd, 7.6-systemd, 7.7-systemd, 7.8-systemd, 7.9-systemd

Children:

58c8823

Parents:

3e2ac00

Message:

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

Location:

chapter06

Files:

• automake.xml (modified) (1 diff)
• creatingdirs.xml (modified) (1 diff)
• flex.xml (modified) (1 diff)

chapter06/automake.xml

@@ -56 +56 @@
     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>

chapter06/creatingdirs.xml

@@ -21 +21 @@
 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 && ln -sv lib /usr/lib64 && ln -sv lib /usr/local/lib64 ;;

chapter06/flex.xml

@@ -48 +48 @@
     <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>