aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerard Beekmans <gerard@linuxfromscratch.org>2003-01-15 19:49:29 +0000
committerGerard Beekmans <gerard@linuxfromscratch.org>2003-01-15 19:49:29 +0000
commit2424a66ecc06724e8ecb55cf6adb070715f1effd (patch)
tree7af3c849607c82e091d71a64f72dc9a441d9961e
parentda72ce8a183d062912f1cc733e3c27cbc61609c7 (diff)
converted c6-make
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2341 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter06/make-exp.xml13
-rw-r--r--chapter06/make-inst.xml26
-rw-r--r--chapter06/make.xml5
-rw-r--r--entities/make.ent2
4 files changed, 24 insertions, 22 deletions
diff --git a/chapter06/make-exp.xml b/chapter06/make-exp.xml
deleted file mode 100644
index 7bd539b7f..000000000
--- a/chapter06/make-exp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para>By default <filename>/usr/bin/make</filename> is installed setgid
-kmem. This is needed on some systems so it can check the load average by
-using <filename>/dev/kmem</filename>. However, on Linux systems, setgid
-kmem is not needed, so we remove this from our <filename>make</filename>
-binary. This also fixes problems with the <filename>make</filename>
-ignoring certain variables like
-<emphasis>LD_LIBRARY_PATH</emphasis>.</para>
-
-</sect2>
-
diff --git a/chapter06/make-inst.xml b/chapter06/make-inst.xml
index 02cce215e..f80096f4d 100644
--- a/chapter06/make-inst.xml
+++ b/chapter06/make-inst.xml
@@ -1,12 +1,28 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
<sect2>
<title>Installation of Make</title>
-<para>Install Make by running the following commands:</para>
+<para>Prepare Make to be compiled:</para>
+
+<para><screen><userinput>./configure --prefix=/usr</userinput></screen></para>
+
+<para>Continue with compiling the package:</para>
+
+<para><screen><userinput>make</userinput></screen></para>
+
+<para>And finish off installing the package:</para>
+
+<para><screen><userinput>make install</userinput></screen></para>
+
+<para>By default <filename>/usr/bin/make</filename> is installed setgid
+kmem. This is needed on some systems so it can check the load average by
+using <filename>/dev/kmem</filename>. However, on Linux systems, setgid
+kmem is not needed, so we remove this from our <filename>make</filename>
+binary. This also fixes problems with the <filename>make</filename>
+ignoring certain variables like <emphasis>LD_LIBRARY_PATH</emphasis>.</para>
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
-make &amp;&amp;
-make install &amp;&amp;
-chgrp root /usr/bin/make &amp;&amp;
+<para><screen><userinput>chgrp root /usr/bin/make &amp;&amp;
chmod 755 /usr/bin/make</userinput></screen></para>
</sect2>
diff --git a/chapter06/make.xml b/chapter06/make.xml
index 94e5f96cc..0f477d832 100644
--- a/chapter06/make.xml
+++ b/chapter06/make.xml
@@ -5,9 +5,8 @@
<screen>Estimated build time: &make-time;
Estimated required disk space: &make-compsize;</screen>
-&c6-make-inst;
-&c6-make-exp;
-&aa-make-desc;
+&aa-make-shortdesc;
&aa-make-dep;
+&c6-make-inst;
</sect1>
diff --git a/entities/make.ent b/entities/make.ent
index f8aebcde8..d93c1f934 100644
--- a/entities/make.ent
+++ b/entities/make.ent
@@ -5,10 +5,10 @@
<!ENTITY c6-make SYSTEM "../chapter06/make.xml">
<!ENTITY c6-make-inst SYSTEM "../chapter06/make-inst.xml">
-<!ENTITY c6-make-exp SYSTEM "../chapter06/make-exp.xml">
<!ENTITY aa-make SYSTEM "../appendixa/make.xml">
<!ENTITY aa-make-shortdesc SYSTEM "../appendixa/make-shortdesc.xml">
+<!ENTITY aa-make-shortdesc SYSTEM "../appendixa/make-shortdesc.xml">
<!ENTITY aa-make-desc SYSTEM "../appendixa/make-desc.xml">
<!ENTITY aa-make-dep SYSTEM "../appendixa/make-dep.xml">
<!ENTITY aa-make-down SYSTEM "../appendixa/make-down.xml">