moved kernel man pages to end of chap6 | fixed typo in glibc linuxthreads man page install

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2259 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

10 files changed, 44 insertions, 9 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index e967e0592..7fc14b0cd 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -49,6 +49,13 @@
 </itemizedlist>
 </para></listitem>
 
+<listitem><para>January 1st, 2002 [gerard]: Chapter 06 - Glibc Second Pass:
+Fixec typo in linuxthreads man pages installation.</para></listitem>
+
+<listitem><para>January 1st, 2002 [gerard]: Chapter 06 - Linux Kernel: The
+man pages can't be installed here because it requires Perl. Moved to end of
+chapter 6.</para></listitem>
+
 <listitem><para>December 31st, 2002 [gerard]: Chapter 06 - Man: Updated the
 patch so man pages are formatted properly on screens with more than 80
 columns.</para></listitem>
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 3cf4f1573..36d223499 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -62,6 +62,7 @@
 &c6-sysvinit;
 &c6-tar;
 &c6-utillinux;
+&c6-kernel-manpages;
 &c6-glibc-pass2;
 &c6-bootscripts;
 &c6-configure;
diff --git a/chapter06/glibc-pass2-inst.xml b/chapter06/glibc-pass2-inst.xml
index 5e5637b30..876430117 100644
--- a/chapter06/glibc-pass2-inst.xml
+++ b/chapter06/glibc-pass2-inst.xml
@@ -45,7 +45,7 @@ cd ../glibc-build &amp;&amp;
 make &amp;&amp;
 make install &amp;&amp;
 make -C ../glibc-&glibc-version;/linuxthreads/man &amp;&amp;
-make -C ../glibc-&glibc-version;/linuxthread/man install &amp;&amp;
+make -C ../glibc-&glibc-version;/linuxthreads/man install &amp;&amp;
 exec /bin/bash --login</userinput></screen></para>
 
 </sect2>
diff --git a/chapter06/glibc-pass2.xml b/chapter06/glibc-pass2.xml
index 2afc9d930..e9826c957 100644
--- a/chapter06/glibc-pass2.xml
+++ b/chapter06/glibc-pass2.xml
@@ -2,8 +2,8 @@
 <title>Installing Glibc-&glibc-version;</title>
 <?dbhtml filename="glibc-pass2.html" dir="chapter06"?>
 
-<screen>Estimated build time:           &glibc-time;
-Estimated required disk space:  &glibc-compsize;</screen>
+<screen>Estimated build time:           &glibc-pass2-time;
+Estimated required disk space:  &glibc-pass2-compsize;</screen>
 
 &c6-glibc-pass2-inst;
 
diff --git a/chapter06/kernel-inst.xml b/chapter06/kernel-inst.xml
index 2324ad707..ff09e3aa7 100644
--- a/chapter06/kernel-inst.xml
+++ b/chapter06/kernel-inst.xml
@@ -1,5 +1,5 @@
 <sect2>
-<title>Installation of the kernel headers and man pages</title>
+<title>Installation of the kernel headers</title>
 
 <para>We won't be compiling a new kernel yet -- we'll do that when we have
 finished the installation of all the packages. But as some packages need the
@@ -20,19 +20,17 @@ access to the kernel source.</para>
 0.0</userinput> on the linux-&kernel-version; directory to ensure all files
 are owned by user <emphasis>root</emphasis>.</para>
 
-<para>The kernel headers and man pages are installed by running the following
+<para>The kernel headers are installed by running the following
 commands:</para>
 
 <para><screen><userinput>ln -s /static/bin/pwd /bin/pwd &amp;&amp;
 make mrproper &amp;&amp;
 make include/linux/version.h &amp;&amp;
 make symlinks &amp;&amp;
-make mandocs &amp;&amp;
 cp -HR include/asm /usr/include &amp;&amp;
 cp -R include/asm-generic /usr/include &amp;&amp;
 cp -R include/linux /usr/include &amp;&amp;
 touch /usr/include/linux/autoconf.h &amp;&amp;
-cp -a Documentation/man /usr/share/man/man9 &amp;&amp;
 rm /bin/pwd</userinput></screen></para>
 
 </sect2>
diff --git a/chapter06/kernel-manpages-inst.xml b/chapter06/kernel-manpages-inst.xml
new file mode 100644
index 000000000..91fbbd5bc
--- /dev/null
+++ b/chapter06/kernel-manpages-inst.xml
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of the kernel man pages</title>
+
+<para>The kernel man pages are installed by running the following
+commands:</para>
+
+<para><screen><userinput>make mandocs &amp;&amp;
+cp -a Documentation/man /usr/share/man/man9</userinput></screen></para>
+
+</sect2>
+
diff --git a/chapter06/kernel-manpages.xml b/chapter06/kernel-manpages.xml
new file mode 100644
index 000000000..f6f4b6ea0
--- /dev/null
+++ b/chapter06/kernel-manpages.xml
@@ -0,0 +1,11 @@
+<sect1 id="ch06-kernel-manpages">
+<title>Installing Linux-&kernel-version; man pages</title>
+<?dbhtml filename="kernel-manpges.html" dir="chapter06"?>
+
+<screen>Estimated build time:           &kernel-manpages-time;
+Estimated required disk space:  &kernel-manpages-compsize;</screen>
+
+&c6-kernel-manpages-inst;
+
+</sect1>
+
diff --git a/chapter06/kernel.xml b/chapter06/kernel.xml
index 3be877efb..74fb6bba0 100644
--- a/chapter06/kernel.xml
+++ b/chapter06/kernel.xml
@@ -1,5 +1,5 @@
 <sect1 id="ch06-kernel">
-<title>Installing Linux-&kernel-version;</title>
+<title>Installing Linux-&kernel-version; headers</title>
 <?dbhtml filename="kernel.html" dir="chapter06"?>
 
 <screen>Estimated build time:           &kernel-time-headers;
diff --git a/entities/glibc.ent b/entities/glibc.ent
index bb068bbca..37e9d7d15 100644
--- a/entities/glibc.ent
+++ b/entities/glibc.ent
@@ -27,4 +27,6 @@
 <!ENTITY glibc-threads-package "glibc-linuxthreads-&glibc-version;.tar.bz2">
 
 <!ENTITY glibc-compsize "369 MB">
+<!ENTITY glibc-pass2-compsize "To Be Determined">
 <!ENTITY glibc-time "14.71 SBU">
+<!ENTITY glibc-pass2-time "To Be Determined">
diff --git a/entities/kernel.ent b/entities/kernel.ent
index 00a2a1719..779496e8b 100644
--- a/entities/kernel.ent
+++ b/entities/kernel.ent
@@ -4,6 +4,8 @@
 <!ENTITY c6-kernel-inst SYSTEM "../chapter06/kernel-inst.xml">
 <!ENTITY c6-kernel-exp SYSTEM "../chapter06/kernel-exp.xml">
 <!ENTITY c6-kernel-exp-headers SYSTEM "../chapter06/kernel-exp-headers.xml">
+<!ENTITY c6-kernel-manpages SYSTEM "../chapter06/kernel-manpages.xml">
+<!ENTITY c6-kernel-manpages-inst SYSTEM "../chapter06/kernel-manpages-inst.xml">
 
 <!ENTITY c8-kernel SYSTEM "../chapter08/kernel.xml">
 
@@ -20,7 +22,10 @@
 <!ENTITY kernel-dir "linux">
 
 <!ENTITY kernel-compsize-headers "142 MB">
-<!ENTITY kernel-time-headers "0.02">
+<!ENTITY kernel-time-headers "0.02 SBU">
 
 <!ENTITY kernel-compsize "All default options: 181 MB">
+<!ENTITY kernel-manpages-compsize "To Be Determined">
 <!ENTITY kernel-time "All default options: 4.20 SBU">
+<!ENTITY kernel-manpages-time "0.01 SBU">
+