aboutsummaryrefslogtreecommitdiffstats
path: root/chapter05
diff options
context:
space:
mode:
authorGerard Beekmans <gerard@linuxfromscratch.org>2003-01-11 16:43:41 +0000
committerGerard Beekmans <gerard@linuxfromscratch.org>2003-01-11 16:43:41 +0000
commit873ec177165d1a9d97a917d532902b55567a18e5 (patch)
treebc221e19cf0ee6039a66feecda8054c36dc4354a /chapter05
parent90423c094424faf7172bf9642f3db2843e11bccd (diff)
rewrote bzip2 installation page
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2309 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter05')
-rw-r--r--chapter05/bzip2-exp.xml8
-rw-r--r--chapter05/bzip2-inst.xml25
-rw-r--r--chapter05/bzip2.xml5
3 files changed, 25 insertions, 13 deletions
diff --git a/chapter05/bzip2-exp.xml b/chapter05/bzip2-exp.xml
deleted file mode 100644
index c6350d66c..000000000
--- a/chapter05/bzip2-exp.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para><userinput>make CC="gcc -static -s": </userinput>These flags instruct
-gcc to statically link bzip2, without compiling symbols.</para>
-
-</sect2>
-
diff --git a/chapter05/bzip2-inst.xml b/chapter05/bzip2-inst.xml
index d913d4ad8..f6f8183c2 100644
--- a/chapter05/bzip2-inst.xml
+++ b/chapter05/bzip2-inst.xml
@@ -1,10 +1,31 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
<sect2>
<title>Installation of Bzip2</title>
-<para>Install Bzip2 by running the following commands:</para>
+<para>Since the Bzip2 package has no configure script we can't prepare it
+for compilation. Instead we just run the <userinput>make</userinput>
+program and start compiling, with a few variables changed to suit our
+environment:</para>
-<para><screen><userinput>make CC="gcc -static -s" &amp;&amp;
+<para><screen><userinput>make CC="gcc -static -s"
make PREFIX=$LFS/static install</userinput></screen></para>
+<para>The meaning of the make options are:</para>
+
+<itemizedlist>
+
+<listitem><para><userinput>CC="gcc -static -s":</userinput> The Bzip2 package
+does not honour the <emphasis>LDFLAGS</emphasis> variable, so instead we set
+the <emphasis>CC</emphasis> variable which defines which compiler to use.
+The <emphasis>-static</emphasis> option tells the compiler to link all
+programs statically.</para></listitem>
+
+<listitem><para><userinput>PREFIX=$LFS/static:</userinput> Instead of
+passing a <emphasis>--prefix=$LFS/static</emphasis> to a configure script,
+we set the <emphasis>PREFIX</emphasis> variable to accomplish the same goal
+(since there is no configure script present).</para></listitem>
+</itemizedlist>
+
</sect2>
diff --git a/chapter05/bzip2.xml b/chapter05/bzip2.xml
index 04262f0c5..296bfec6b 100644
--- a/chapter05/bzip2.xml
+++ b/chapter05/bzip2.xml
@@ -5,10 +5,9 @@
<screen>Estimated build time: &bzip2-time-static;
Estimated required disk space: &bzip2-compsize-static;</screen>
-&c5-bzip2-inst;
-&c5-bzip2-exp;
-&aa-bzip2-desc;
+&aa-bzip2-shortdesc;
&aa-bzip2-dep;
+&c5-bzip2-inst;
</sect1>