From 4248b0ec1488319d448ad624e275a9a2811c0090 Mon Sep 17 00:00:00 2001 From: Alex Gronenwoud Date: Wed, 4 Feb 2004 22:22:26 +0000 Subject: Minor textual tweaks. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3219 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- appendixa/file-down.xml | 1 + appendixa/glibc-down.xml | 1 + appendixa/tcl-down.xml | 3 +-- chapter03/chapter03.xml | 2 +- chapter06/coreutils.xml | 2 +- chapter06/ed.xml | 10 +++++----- chapter06/flex.xml | 9 +++++---- chapter06/gcc.xml | 9 +++------ chapter06/inetutils.xml | 3 ++- chapter06/nettools.xml | 12 +++++------- chapter06/perl.xml | 11 ++++------- chapter06/zlib.xml | 12 ++++++------ 12 files changed, 35 insertions(+), 40 deletions(-) diff --git a/appendixa/file-down.xml b/appendixa/file-down.xml index 1b4b2425e..3f95fdec8 100644 --- a/appendixa/file-down.xml +++ b/appendixa/file-down.xml @@ -1,4 +1,5 @@ Official download location for File (&file-version;): + Alternative download location: diff --git a/appendixa/glibc-down.xml b/appendixa/glibc-down.xml index 2fb9b4acc..27a99e8a6 100644 --- a/appendixa/glibc-down.xml +++ b/appendixa/glibc-down.xml @@ -1,5 +1,6 @@ Official download location for Glibc (&glibc-version;): + Alternative download locations (courtesy of the generous LFS Mirrors): diff --git a/appendixa/tcl-down.xml b/appendixa/tcl-down.xml index b03c4f65d..67bbadf8a 100644 --- a/appendixa/tcl-down.xml +++ b/appendixa/tcl-down.xml @@ -1,3 +1,2 @@ Official download location for Tcl (&tcl-version;): - - + diff --git a/chapter03/chapter03.xml b/chapter03/chapter03.xml index 2b1fe79ba..9f59c60e1 100644 --- a/chapter03/chapter03.xml +++ b/chapter03/chapter03.xml @@ -75,7 +75,7 @@ file system, but build instructions for other file systems can be found at If you created a (new) swap partition you need to initialize it as a swap partition too (also known as formatting, like you did above with -mke2fs) by running: +mke2fs) by running: mkswap /dev/yyy diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml index 0d2f9cb81..f5b848ea4 100644 --- a/chapter06/coreutils.xml +++ b/chapter06/coreutils.xml @@ -16,7 +16,7 @@ basic system characteristics. Installation of Coreutils -Apply the same "Posixver" patch we used previously: +Apply the same Posixver patch we used previously: patch -Np1 -i ../&coreutils-posixver-patch; diff --git a/chapter06/ed.xml b/chapter06/ed.xml index 8f72ca64c..20dae3bb7 100644 --- a/chapter06/ed.xml +++ b/chapter06/ed.xml @@ -20,12 +20,12 @@ because it can be used by the patch program if you encounter an ed-based patch file. This happens rarely because diff-based patches are preferred these days. -Ed normally uses the mktemp function to create temporary files in -/tmp, but this function contains a -vulnerability (see the section on Temporary Files in Ed normally uses the mktemp function to create +temporary files in /tmp, but this +function contains a vulnerability (see the section on Temporary Files in ). The -following patch makes Ed use mkstemp instead, which is the recommended way to -create temporary files. +following patch makes Ed use mkstemp instead, which is +the recommended way to create temporary files. Apply the patch: diff --git a/chapter06/flex.xml b/chapter06/flex.xml index 809f1ca31..11683221d 100644 --- a/chapter06/flex.xml +++ b/chapter06/flex.xml @@ -34,15 +34,16 @@ following command will do so: make install -There are some packages that expect to find the Lex library in -/usr/lib. Create a symlink to account for this: +There are some packages that expect to find the lex +library in /usr/lib. Create a symlink to account for +this: ln -s libfl.a /usr/lib/libl.a A few programs don't know about flex yet and try to run its predecessor lex. To support those programs, -create a shell script named lex that calls -flex in Lex emulation mode: +create a wrapper script named lex that calls +flex in lex emulation mode: cat > /usr/bin/lex << "EOF" #!/bin/sh diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml index 920ff6831..824307bd6 100644 --- a/chapter06/gcc.xml +++ b/chapter06/gcc.xml @@ -10,7 +10,7 @@ the C and C++ compilers. Official download location for GCC (&gcc-version;): -And for the GCC No-Fixincludes Patch: +And for the patch: &aa-gcc-dep; @@ -32,11 +32,8 @@ GCC-testsuite package. The full GCC package contains even more compilers. Instructions for building these can be found at . -Be careful not to apply the GCC -Specs patch from here. - -First apply the No-Fixincludes patch that we also used in the previous -chapter: +First apply only the No-Fixincludes patch (and not +the Specs patch) also used in the previous chapter: patch -Np1 -i ../&gcc-nofixincludes-patch; diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml index c5a4fc880..43bb389fb 100644 --- a/chapter06/inetutils.xml +++ b/chapter06/inetutils.xml @@ -61,7 +61,8 @@ replacements are available for many of these servers. make install -And move the ping program to its proper place: +And move the ping program to its FHS-compliant +place: mv /usr/bin/ping /bin diff --git a/chapter06/nettools.xml b/chapter06/nettools.xml index 70bcdd33a..2f149de11 100644 --- a/chapter06/nettools.xml +++ b/chapter06/nettools.xml @@ -25,19 +25,17 @@ to actually enable these protocols in the kernel -- what you do here is merely telling the package to include support for those protocols in its programs, but it's up to the kernel to make the protocols available. -First fix a small syntax problem in the sources of the mii-tool -program: +First fix a small syntax problem in the sources of the +mii-tool program: patch -Np1 -i ../&net-tools-mii-patch; -Now prepare Net-tools for compilation with: +Now prepare Net-tools for compilation (if you intend to accept the +defaults, you can skip all the questions by running yes "" | +make config instead): make config -If you intend to accept the default settings, you may skip the -questions generated by make config by running -yes "" | make config instead. - Compile the package: make diff --git a/chapter06/perl.xml b/chapter06/perl.xml index 8e69cbcee..514b33d62 100644 --- a/chapter06/perl.xml +++ b/chapter06/perl.xml @@ -17,16 +17,13 @@ Installation of Perl -Prepare Perl for compilation: +If you want full control over the way Perl is set up, you can run the +interactive Configure script and hand-pick the way this +package is built. If, however, you guess you can live with the (sensible) +defaults it auto-detects, then prepare Perl for compilation with: ./configure.gnu --prefix=/usr -Dpager="/bin/less -isR" -If you want more control over the way Perl sets itself up to be -built, you can run the interactive Configure script -instead and modify the way Perl is built. If you think you can live with the -(sensible) defaults Perl auto-detects, then just use the command listed -above. - The meaning of the configure option: diff --git a/chapter06/zlib.xml b/chapter06/zlib.xml index 5813c4284..8dc8e7817 100644 --- a/chapter06/zlib.xml +++ b/chapter06/zlib.xml @@ -16,16 +16,16 @@ some programs. Installation of Zlib -Prepare Zlib for compilation: - -./configure --prefix=/usr --shared - Zlib is known to build its shared library incorrectly if CFLAGS is specified in the environment. If you are using your own CFLAGS variable, be -sure to add the -fPIC directive to your -CFLAGS for the duration of the above command, then remove it +sure to add the -fPIC directive to your CFLAGS for the +duration of the below configure command, then remove it afterwards. +Prepare Zlib for compilation: + +./configure --prefix=/usr --shared + Compile the package: make -- cgit v1.2.3-54-g00ecf