aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerard Beekmans <gerard@linuxfromscratch.org>2003-01-27 21:28:02 +0000
committerGerard Beekmans <gerard@linuxfromscratch.org>2003-01-27 21:28:02 +0000
commit558cb8a4362c21ac85a8af645b7ef53aa8fba2f5 (patch)
treec6a19b76f8e32cd1f47cfefa5d5ec92f6d532d5c
parentc118e6c2cc98b297772f18a8cf24ed9d09e50de8 (diff)
minor textual changes to chapter 5
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2401 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter05/bash-inst.xml4
-rw-r--r--chapter05/binutils-inst.xml3
-rw-r--r--chapter05/diffutils-inst.xml7
-rw-r--r--chapter05/fileutils-inst.xml6
-rw-r--r--chapter05/gcc-inst.xml8
-rw-r--r--chapter05/shellutils-inst.xml3
-rw-r--r--index.xml2
7 files changed, 16 insertions, 17 deletions
diff --git a/chapter05/bash-inst.xml b/chapter05/bash-inst.xml
index 09b9dae01..f58cbe77d 100644
--- a/chapter05/bash-inst.xml
+++ b/chapter05/bash-inst.xml
@@ -15,7 +15,7 @@ development package. This package is often called something like
this package is already installed, or you just installed it, check for the
two files again. Often the <filename>libcurses.a</filename> file is (still)
missing. If so, create <filename>libcurses.a</filename> as a symlink
-by running the following commands as user <emphasis>root:</emphasis></para>
+by running the following command as user <emphasis>root:</emphasis></para>
<para><screen><userinput>ln -s libncurses.a /usr/lib/libcurses.a</userinput></screen></para>
@@ -50,7 +50,7 @@ being just fine because we will reinstall Bash in Chapter 6 anyway,
where we will use libncurses), but it's a good test to make sure that
the Ncurses package has been installed properly. If not, you will get in
trouble later on in this chapter when you install the Texinfo package.
-That package requires ncurses, and termcap can't reliably be used
+That package requires ncurses, and termcap can't be used
there.</para></listitem>
</itemizedlist>
diff --git a/chapter05/binutils-inst.xml b/chapter05/binutils-inst.xml
index 329074627..226bcd8d4 100644
--- a/chapter05/binutils-inst.xml
+++ b/chapter05/binutils-inst.xml
@@ -7,8 +7,7 @@
optimization flags (including the -march and -mcpu options). Binutils is
best left alone. Therefore, if you have defined any environment variables
that override default optimizations, such as CFLAGS and CXXFLAGS, we
-recommend unsetting or modifying them when building binutils. You have been
-warned.</para>
+recommend unsetting or modifying them when building binutils.</para>
<para>It is recommended by the Binutils installation documentation to build
Binutils outside of the source directory in a dedicated directory:</para>
diff --git a/chapter05/diffutils-inst.xml b/chapter05/diffutils-inst.xml
index 6f707eb6a..90ecbfc64 100644
--- a/chapter05/diffutils-inst.xml
+++ b/chapter05/diffutils-inst.xml
@@ -13,11 +13,12 @@
<itemizedlist>
<listitem><para><userinput>LDFLAGS="-static":</userinput> This is the most
common way to tell a package that all programs should be statically linked.
-This way the <emphasis>LDFLAGS</emphasis> environment variable is set but
+This way the <emphasis>LDFLAGS</emphasis> environment variable is set, but
only in the subshell that the <filename>configure</filename> script runs
in. When <userinput>configure</userinput> has done its job, the
-<emphasis>LDFLAGS</emphasis> variable won't exist
-anymore.</para></listitem>
+<emphasis>LDFLAGS</emphasis> environment variable won't exist anymore
+and the <filename>Makefile</filename> files contain will contain this
+variable locally.</para></listitem>
<listitem><para><userinput>CPPFLAGS=-Dre_max_failures=re_max_failures2:</userinput>
The <emphasis>CPPFLAGS</emphasis> variable is a variable that's read by the
diff --git a/chapter05/fileutils-inst.xml b/chapter05/fileutils-inst.xml
index 3022b7152..489415328 100644
--- a/chapter05/fileutils-inst.xml
+++ b/chapter05/fileutils-inst.xml
@@ -15,13 +15,13 @@ able to compile this package at all, even when your system has an AMD CPU
and has Glibc-2.2.3 (or higher) installed. If that's the case, you'll need
to remove the fileutils-&fileutils-version; directory and unpack it again
from the tarball before continuing. We believe this may be the case when
-your distribution has altered Glibc-2.2.3 somehow, but details are
-unavailable at this time.</para>
+your distribution has altered Glibc-2.2.3 somehow, but the exact details
+are unknown.</para>
<para>To fix this package to compile properly on AMD/Glibc-2.2.3
machines, run the following command. Do <emphasis>NOT</emphasis>
attempt this fix if you don't have Glibc-2.2.3 installed. It will more
-than likely result in all kinds of compile time problems.</para>
+than likely result in all kinds of compilation problems.</para>
<para><screen><userinput>patch -Np1 -i ../fileutils-&fileutils-patch-version;.patch</userinput></screen></para>
diff --git a/chapter05/gcc-inst.xml b/chapter05/gcc-inst.xml
index 1de7f2a99..ec4d81c67 100644
--- a/chapter05/gcc-inst.xml
+++ b/chapter05/gcc-inst.xml
@@ -10,8 +10,7 @@ the gcc-core tarball needs to be unpacked at this time.</para>
default optimization flags (including the -march and -mcpu options). GCC is
best left alone. Therefore, if you have defined any environment variables
that override default optimizations, such as CFLAGS and CXXFLAGS, we
-recommend unsetting or modifying them when building GCC. You have
-been warned.</para>
+recommend unsetting or modifying them when building GCC.</para>
<para>It is recommended by the GCC installation documentation to build
GCC outside of the source directory in a dedicated directory:</para>
@@ -32,7 +31,8 @@ cd ../gcc-build</userinput></screen></para>
<listitem><para><userinput>--prefix=/static:</userinput> This is NOT a
typo. GCC hard codes some paths while compiling and so we need to pass
<filename class="directory">/static</filename> as the prefix during the
-configure stage. We pass the real install prefix during the installation
+configure stage. We will pass the real installation prefix (<filename
+class="directory">$LFS/static</filename> during the installation
stage later on.</para></listitem>
<listitem><para><userinput>--disable-shared:</userinput> This prevents the
@@ -82,7 +82,7 @@ If so, it will fix them and put them in
<filename>$LFS/static/lib/gcc-lib/i686-pc-linux-gnu/3.2</filename>. Later on
in chapter 6 you will install Glibc which will put its header files in
<filename>/usr/include</filename>. Next you will install other programs that
-use the Glibc headers. GCC will look in
+use the Glibc headers and GCC will look in
<filename>/static/lib/gcc-lib</filename> before looking in
<filename>/usr/include</filename>, with the result of finding and using the
fixed Glibc header files from your host distribution, which are probably
diff --git a/chapter05/shellutils-inst.xml b/chapter05/shellutils-inst.xml
index c0384a4d1..a15c9d9d5 100644
--- a/chapter05/shellutils-inst.xml
+++ b/chapter05/shellutils-inst.xml
@@ -31,8 +31,7 @@ NOTE: to install su, run 'make install-root' as root</screen></blockquote>
<para>You can safely ignore that warning. You need to be logged in as root
in order to install su the way Sh-utils wants to install it, which is being
suid root. Because we don't need su during Chapter 6, and su will be properly
-installed when we re-install Sh-utils in Chapter 6, you can just
-pretend you didn't see it.</para>
+installed when we re-install Sh-utils in Chapter 6.</para>
</sect2>
diff --git a/index.xml b/index.xml
index 0c2650188..4680de2c1 100644
--- a/index.xml
+++ b/index.xml
@@ -5,7 +5,7 @@
<!ENTITY book SYSTEM "book/book.xml">
<!ENTITY version "20030122">
-<!ENTITY releasedate "January 22nd, 2003">
+<!ENTITY releasedate "January 27nd, 2003">
<!ENTITY ftp-root "ftp://ftp.linuxfromscratch.org">
<!ENTITY http-root "http://ftp.linuxfromscratch.org">