소스 검색

Billy's bzip2 layout.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2364 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Timothy Bauscher 22 년 전
부모
커밋
8d1f932466
3개의 변경된 파일29개의 추가작업 그리고 9개의 파일을 삭제
  1. 27 5
      chapter06/bzip2-inst.xml
  2. 2 3
      chapter06/bzip2.xml
  3. 0 1
      entities/bzip2.ent

+ 27 - 5
chapter06/bzip2-inst.xml

@@ -1,18 +1,40 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Installation of Bzip2</title>
 
-<para>Install Bzip2 by running the following commands:</para>
+<para>Compile the package:</para>
+<para><screen><userinput>
+make -f Makefile-libbz2_so &amp;&amp;
+make
+</userinput></screen></para>
+
+<para>And finish off installing the package:</para>
+
+<para><screen><userinput>
+make install</userinput></screen></para>
+
+<para>Copy the Bzip2 binary into the /bin directory, make some
+  neccessary symbolic links and clean up.</para>
 
-<para><screen><userinput>make -f Makefile-libbz2_so &amp;&amp;
-make &amp;&amp;
-make install &amp;&amp;
+<para><screen><userinput>
 cp bzip2-shared /bin/bzip2 &amp;&amp;
 cp -a libbz2.so* /lib &amp;&amp;
 ln -s ../../lib/libbz2.so.1.0 /usr/lib/libbz2.so &amp;&amp;
 rm /usr/bin/{bunzip2,bzcat,bzip2} &amp;&amp;
 mv /usr/bin/{bzip2recover,bzless,bzmore} /bin &amp;&amp;
 ln -s bzip2 /bin/bunzip2 &amp;&amp;
-ln -s bzip2 /bin/bzcat</userinput></screen></para>
+ln -s bzip2 /bin/bzcat
+</userinput></screen></para>
 
 </sect2>
 
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>make -f Makefile-libbz2_so:</userinput> This will cause bzip2
+to be built using a different Makefile file, in this case the
+Makefile-libbz2_so file, which creates a dynamic libbz2.so library and
+links the bzip2 utilities against it.</para>
+
+</sect2>

+ 2 - 3
chapter06/bzip2.xml

@@ -5,9 +5,8 @@
 <screen>Estimated build time:           &bzip2-time;
 Estimated required disk space:  &bzip2-compsize;</screen>
 
-&c6-bzip2-inst;
-&c6-bzip2-exp;
-&aa-bzip2-desc;
+&aa-bzip2-shortdesc;
 &aa-bzip2-dep;
+&c6-bzip2-inst;
 
 </sect1>

+ 0 - 1
entities/bzip2.ent

@@ -5,7 +5,6 @@
 
 <!ENTITY c6-bzip2 SYSTEM "../chapter06/bzip2.xml">
 <!ENTITY c6-bzip2-inst SYSTEM "../chapter06/bzip2-inst.xml">
-<!ENTITY c6-bzip2-exp SYSTEM "../chapter06/bzip2-exp.xml">
 
 <!ENTITY aa-bzip2 SYSTEM "../appendixa/bzip2.xml">
 <!ENTITY aa-bzip2-shortdesc SYSTEM "../appendixa/bzip2-shortdesc.xml">