aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06
diff options
context:
space:
mode:
authorGerard Beekmans <gerard@linuxfromscratch.org>2003-01-01 14:27:12 +0000
committerGerard Beekmans <gerard@linuxfromscratch.org>2003-01-01 14:27:12 +0000
commita20338e3bd6b3d1ccef2d6619102963d810fa3d4 (patch)
tree3aaadd7513b0ed5af958e4727f8d70a8f7f0ce8e /chapter06
parenta9fb6a45626023ed9e1fab231b7adf1235b31e0e (diff)
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
Diffstat (limited to 'chapter06')
-rw-r--r--chapter06/chapter06.xml1
-rw-r--r--chapter06/glibc-pass2-inst.xml2
-rw-r--r--chapter06/glibc-pass2.xml4
-rw-r--r--chapter06/kernel-inst.xml6
-rw-r--r--chapter06/kernel-manpages-inst.xml11
-rw-r--r--chapter06/kernel-manpages.xml11
-rw-r--r--chapter06/kernel.xml2
7 files changed, 29 insertions, 8 deletions
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;