From 972014586e742e763dda2347d614d38e0f82223b Mon Sep 17 00:00:00 2001
From: Timothy Bauscher <timothy@linuxfromscratch.org>
Date: Sun, 11 May 2003 17:03:47 +0000
Subject: Added the rest of Zack's patches. Totally missed them before.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2561 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/bzip2-inst.xml     |  3 ++-
 chapter06/coreutils-inst.xml | 32 +++++++++++++++++++++++++-------
 chapter06/gcc-inst.xml       |  1 +
 chapter06/nettools-inst.xml  | 10 +---------
 chapter06/zlib-inst.xml      | 17 +++++++++++------
 5 files changed, 40 insertions(+), 23 deletions(-)

(limited to 'chapter06')

diff --git a/chapter06/bzip2-inst.xml b/chapter06/bzip2-inst.xml
index afbd5ee37..fdcee6fd4 100644
--- a/chapter06/bzip2-inst.xml
+++ b/chapter06/bzip2-inst.xml
@@ -5,7 +5,8 @@
 
 <para>Begin compiling the package:</para>
 
-<para><screen><userinput>make -f Makefile-libbz2_so</userinput></screen></para>
+<para><screen><userinput>make -f Makefile-libbz2_so &amp;&amp;
+make clean</userinput></screen></para>
 
 <para>The <emphasis>-f</emphasis> flag will cause bzip2 to be built
 using a different <filename>Makefile</filename> file, in this case the
diff --git a/chapter06/coreutils-inst.xml b/chapter06/coreutils-inst.xml
index d57a9b490..5947d38c9 100644
--- a/chapter06/coreutils-inst.xml
+++ b/chapter06/coreutils-inst.xml
@@ -3,18 +3,36 @@
 <sect2>
 <title>Installation of Coreutils</title>
 
-<para><screen><userinput>./configure --prefix=/usr
-make
-make install
-mv /usr/bin/{basename,cat,chgrp,chmod,chown,cp,dd,df} /bin &amp;&amp;
+<para>Normally the functionality of uname is somewhat broken, in that
+the -p switch always returns "unknown". This patch fixes that behaviour:</para>
+
+<para><screen><userinput>patch -Np1 -i ../coreutils-&coreutils-patch-version;.patch</userinput></screen></para>
+
+<para>Prepare Coreutils to be compiled:</para>
+
+<para><screen><userinput>./configure --prefix=/usr</userinput></screen></para>
+
+<para>Continue with compiling the package:</para>
+
+<para><screen><userinput>make</userinput></screen></para>
+
+<para>Install the package:</para>
+
+<para><screen><userinput>make install</userinput></screen></para>
+
+<para>Move files to their proper locations:</para>
+
+<para><screen><userinput>mv /usr/bin/{basename,cat,chgrp,chmod,chown,cp,dd,df} /bin &amp;&amp;
 mv /usr/bin/{dir,dircolors,du,date,echo,false,head} /bin &amp;&amp;
 mv /usr/bin/{install,ln,ls,mkdir,mkfifo,mknod,mv,pwd} /bin &amp;&amp;
 mv /usr/bin/{rm,rmdir,shred,sync,sleep,stty,su,test} /bin &amp;&amp;
 mv /usr/bin/{touch,true,uname,vdir} /bin
-mv /usr/bin/chroot /usr/sbin
-ln -s test /bin/[
-ln -s ../../bin/install /usr/bin</userinput></screen></para>
+mv /usr/bin/chroot /usr/sbin</userinput></screen></para>
+
+<para>Finally, create a few necessary symlinks</para>
 
+<para><screen><userinput>ln -s test /bin/[
+ln -s ../../bin/install /usr/bin</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter06/gcc-inst.xml b/chapter06/gcc-inst.xml
index 0d35d818c..c0c228afd 100644
--- a/chapter06/gcc-inst.xml
+++ b/chapter06/gcc-inst.xml
@@ -75,5 +75,6 @@ symlink:</para>
 <para><screen><userinput>ln -s gcc /usr/bin/cc</userinput></screen></para>
 
 <para><screen><userinput>rm /usr/lib/libiberty.a</userinput></screen></para>
+<para><screen><userinput>rm /usr/include/libiberty.h</userinput></screen></para>
 
 </sect2>
diff --git a/chapter06/nettools-inst.xml b/chapter06/nettools-inst.xml
index 88a75637c..daeff400a 100644
--- a/chapter06/nettools-inst.xml
+++ b/chapter06/nettools-inst.xml
@@ -25,15 +25,7 @@ the questions generated by <emphasis>make</emphasis> by running
 
 <para>Finish installing the package:</para>
 
-<para><screen><userinput>make update</userinput></screen></para>
-
-<para>The <emphasis>update</emphasis> option to <userinput>make</userinput>
-works similarly to the <emphasis>install</emphasis> option, with one
-exception: it doesn't make backups of files it's replacing.</para>
-
-<para>If you decide to reinstall this package at some point in the
-future, a <userinput>make update</userinput> won't backup all the files
-from a previous net-tools installation.</para>
+<para><screen><userinput>make install</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter06/zlib-inst.xml b/chapter06/zlib-inst.xml
index 1de4994c3..268b7c66c 100644
--- a/chapter06/zlib-inst.xml
+++ b/chapter06/zlib-inst.xml
@@ -14,18 +14,23 @@ so by applying this patch:</para>
 <para><screen><userinput>CFLAGS="$CFLAGS -fPIC" \
 &nbsp;&nbsp;&nbsp;&nbsp;./configure --prefix=/usr --shared</userinput></screen></para>
 
+         make clean
+         ./configure --prefix=/usr
+         make
+         make install
+
 <para>The <emphasis>-fPIC</emphasis> flag helps to assure
 quality in the dynamic zlib library.</para>
 
-<para>Some packages expect a static zlib library to be present
-on the system. To satisfy those programs, compile both the
-shared and static libraries:</para>
-
-<para><screen><userinput>make LIBS="libz.so.1.1.4 libz.a"</userinput></screen></para>
+<para><screen><userinput>make</userinput></screen></para>
 
 <para>Install the libraries:</para>
 
-<para><screen><userinput>make LIBS="libz.so.1.1.4 libz.a" install</userinput></screen></para>
+<para><screen><userinput>make install &amp;&amp;
+make clean &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
 
 <para>The shared zlib library should be installed in the
 <filename>/lib</filename> directory. That way, in the event
-- 
cgit v1.2.3-54-g00ecf