aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml3
-rw-r--r--chapter05/fileutils-exp.xml4
-rw-r--r--chapter05/gcc-exp.xml11
-rw-r--r--index.xml4
4 files changed, 8 insertions, 14 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 91045404b..2ecd3dfac 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -45,6 +45,9 @@
</itemizedlist>
</para></listitem>
+<listitem><para>June 6th, 2002 [markh] - Chapter 05 - Tidy up
+explanations following the /static change.</para></listitem>
+
<listitem><para>June 5th, 2002 [timothy] Preface - Who would
not want to read this book: applied a revised version of
Scot's grammar patch.</para></listitem>
diff --git a/chapter05/fileutils-exp.xml b/chapter05/fileutils-exp.xml
index 2accc77ed..65d19c2c1 100644
--- a/chapter05/fileutils-exp.xml
+++ b/chapter05/fileutils-exp.xml
@@ -1,10 +1,6 @@
<sect2>
<title>Command explanations</title>
-<para><userinput>cp lib/Makefile.in lib/Makefile.in.backup :</userinput> We
-run this command in order to keep a backup of the file we are about to
-change.</para>
-
<para><userinput>patch -Np1 -i ../fileutils-&fileutils-version;.patch:</userinput> This is used to fix a problem with building fileutils statically on
glibc 2.2.3 systems. If this isn't done, then there is the possibility of
all of the fileutils programs causing segmentation faults once chroot is
diff --git a/chapter05/gcc-exp.xml b/chapter05/gcc-exp.xml
index d79d92c14..b0aabec83 100644
--- a/chapter05/gcc-exp.xml
+++ b/chapter05/gcc-exp.xml
@@ -5,7 +5,7 @@
This is the equivalent to make LDFLAGS=-static as we use with other
packages to compile them statically.</para>
-<para><userinput>--prefix=/usr:</userinput> This is NOT a typo. GCC hard
+<para><userinput>--prefix=/static:</userinput> This is NOT a typo. GCC hard
codes some paths while compiling and so we need to pass /usr as the
prefix during ./configure. We pass the real install prefix during the
make install command later.</para>
@@ -18,13 +18,8 @@ the --enable-languages parameter can be omitted.</para>
<para><userinput>--enable-threads=posix:</userinput> This enables C++
exception handling for multithreaded code.</para>
-<para><userinput>ln -sf ../usr/bin/cpp:</userinput> This
-creates the $LFS/lib/cpp symlink. Some packages explicitly try to find
-cpp in /lib.</para>
-
-<para><userinput>ln -sf ../bin/cpp:</userinput> This
-creates the $LFS/usr/lib/cpp symlink as there are packages that expect
-cpp to be in /usr/lib.</para>
+<para><userinput>ln -s gcc $LFS/static/bin/cc:</userinput> This
+creates the $LFS/static/bin/gcc symlink which some packages need.</para>
</sect2>
diff --git a/index.xml b/index.xml
index 84d02257c..784a0d59c 100644
--- a/index.xml
+++ b/index.xml
@@ -4,8 +4,8 @@
<!ENTITY book SYSTEM "book/book.xml">
-<!ENTITY version "20020605">
-<!ENTITY releasedate "June 5th, 2002">
+<!ENTITY version "20020606">
+<!ENTITY releasedate "June 6th, 2002">
<!ENTITY ftp-root "ftp://ftp.linuxfromscratch.org">
<!ENTITY http-root "http://ftp.linuxfromscratch.org">