From caca15ff94b1c80f1b3209b4e8b0248ead7b01b6 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pieere@linuxfromscratch.org>
Date: Mon, 1 Jun 2020 09:45:53 +0000
Subject: Fixes due to the new layout

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/cross-chap5@11885 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter05/chapter05.xml | 2 +-
 chapter06/bzip2.xml     | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml
index 5d8ada259..ddd652709 100644
--- a/chapter05/chapter05.xml
+++ b/chapter05/chapter05.xml
@@ -44,7 +44,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="createfiles.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libstdc++-pass2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="flex.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="flex.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python.xml"/>
diff --git a/chapter06/bzip2.xml b/chapter06/bzip2.xml
index c42096ea3..edf2f5bd4 100644
--- a/chapter06/bzip2.xml
+++ b/chapter06/bzip2.xml
@@ -90,7 +90,10 @@ make clean</userinput></screen>
 
 <screen><userinput remap="install">cp -v bzip2-shared /bin/bzip2
 cp -av libbz2.so* /lib
-rm -v /usr/bin/{bunzip2,bzcat,bzip2}</userinput></screen>
+ln -sv ../../lib/libbz2.so.1.0 $LFS/usr/lib/libbz2.so
+rm -v /usr/bin/{bunzip2,bzcat,bzip2}
+ln -sv bzip2 /bin/bunzip2
+ln -sv bzip2 /bin/bzcat</userinput></screen>
 
   </sect2>
 
-- 
cgit v1.2.3-54-g00ecf