aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06
diff options
context:
space:
mode:
authorGerard Beekmans <gerard@linuxfromscratch.org>2002-12-31 16:38:25 +0000
committerGerard Beekmans <gerard@linuxfromscratch.org>2002-12-31 16:38:25 +0000
commit6143d137e463774e0199c976a76e54bdacc9f7d0 (patch)
tree3fbe9256df286a1492310e0bf2488b2a7c52de7c /chapter06
parentf4e03a1910a9495ab703cb8c26caba1a5248bf4b (diff)
upgraded to glibc-2.3.1, added 2nd glibc install
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2246 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter06')
-rw-r--r--chapter06/chapter06.xml2
-rw-r--r--chapter06/glibc-inst.xml4
-rw-r--r--chapter06/linuxthreadsmanpages-inst.xml16
-rw-r--r--chapter06/linuxthreadsmanpages.xml14
4 files changed, 3 insertions, 33 deletions
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index c5ba6389d..3cf4f1573 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -34,7 +34,6 @@
&c6-gettext;
&c6-nettools;
&c6-perl;
-&c6-linuxthreadsmanpages;
&c6-texinfo;
&c6-autoconf;
&c6-automake;
@@ -63,6 +62,7 @@
&c6-sysvinit;
&c6-tar;
&c6-utillinux;
+&c6-glibc-pass2;
&c6-bootscripts;
&c6-configure;
diff --git a/chapter06/glibc-inst.xml b/chapter06/glibc-inst.xml
index a7a757c87..4370cf1de 100644
--- a/chapter06/glibc-inst.xml
+++ b/chapter06/glibc-inst.xml
@@ -44,8 +44,8 @@ to create it first.</para>
<para>The Linux Threads man pages are not going to be installed at this
point because it requires a working Perl installation. We'll install Perl
-later on in this chapter, so we'll come back to the Linux Threads man page
-installation after that.</para>
+later on in this chapter, and the man pages will be installed when Glibc is
+installed for the second time at the end of this chapter.</para>
<para>During the configure stage you will see the following warning:</para>
diff --git a/chapter06/linuxthreadsmanpages-inst.xml b/chapter06/linuxthreadsmanpages-inst.xml
deleted file mode 100644
index 012cb3966..000000000
--- a/chapter06/linuxthreadsmanpages-inst.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<sect2>
-<title>Installation of Linux threads man pages</title>
-
-<para>Unpack the glibc-linuxthreads package and you'll notice that you end
-up with two new directories. Enter the
-<filename class="directory">linuxthreads</filename> directory, not the
-<filename class="directory">linuxthreads_db</filename> directory.</para>
-
-<para>Install the Linux threads man pages by running the following
-commands:</para>
-
-<para><screen><userinput>make -C man &amp;&amp;
-make -C man install</userinput></screen></para>
-
-</sect2>
-
diff --git a/chapter06/linuxthreadsmanpages.xml b/chapter06/linuxthreadsmanpages.xml
deleted file mode 100644
index f955b73e6..000000000
--- a/chapter06/linuxthreadsmanpages.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<sect1 id="ch06-linuxthreadsmanpages">
-<title>Installing Linux threads-&linuxthreadsmanpages-version; man pages</title>
-<?dbhtml filename="linuxthreadsmanpages.html" dir="chapter06"?>
-
-<screen>Estimated build time: &linuxthreadsmanpages-time;
-Estimated required disk space: &linuxthreadsmanpages-compsize;</screen>
-
-&c6-linuxthreadsmanpages-inst;
-&aa-linuxthreadsmanpages-desc;
-&aa-linuxthreadsmanpages-dep;
-
-</sect1>
-
-