cvs commit: LFS/BOOK/entities gawk.ent

gerard at linuxfromscratch.org gerard at linuxfromscratch.org
Sat Jan 11 09:41:17 PST 2003


gerard      03/01/11 12:41:17

  Modified:    BOOK/appendixa gawk-dep.xml gawk-desc.xml gawk.xml
               BOOK/chapter05 bash-inst.xml binutils-inst.xml
                        bzip2-inst.xml diffutils-inst.xml
                        fileutils-inst.xml findutils-inst.xml gawk-inst.xml
                        gawk.xml
               BOOK/entities gawk.ent
  Added:       BOOK/appendixa gawk-shortdesc.xml
  Log:
  reworded for consistency
  
  Revision  Changes    Path
  1.6       +2 -0      LFS/BOOK/appendixa/gawk-dep.xml
  
  Index: gawk-dep.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/appendixa/gawk-dep.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- gawk-dep.xml	12 Sep 2002 16:44:20 -0000	1.5
  +++ gawk-dep.xml	11 Jan 2003 17:41:17 -0000	1.6
  @@ -1,3 +1,5 @@
  +<sect2><title> </title><para> </para></sect2>
  +
   <sect2>
   <title>Gawk Installation Dependencies</title>
   
  
  
  
  1.7       +6 -8      LFS/BOOK/appendixa/gawk-desc.xml
  
  Index: gawk-desc.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/appendixa/gawk-desc.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- gawk-desc.xml	24 Sep 2002 04:52:43 -0000	1.6
  +++ gawk-desc.xml	11 Jan 2003 17:41:17 -0000	1.7
  @@ -1,19 +1,17 @@
  -<sect2><title>Contents of Gawk</title>
  +<sect2><title> </title><para> </para></sect2>
   
  -<para>Last checked against version &gawk-contversion;.</para>
  +<sect2><title>Descriptions</title>
   
  -<sect3><title>Program Files</title>
  -<para>awk, gawk, gawk-3.1.1, grcat, igawk, pgawk, pgawk-3.1.1,
  -pwcat</para></sect3>
  +<para>Last checked against version &gawk-contversion;.</para>
   
  -<sect3><title>Descriptions</title>
  +<sect3><title>Program files descriptions</title>
   
   <sect4><title>awk</title>
   <para>awk is a symbolic link to gawk.</para></sect4>
   
   <sect4><title>gawk, gawk-3.1.1</title>
  -<para>gawk is the GNU implementation of awk,
  -a pattern scanning and processing language.</para></sect4>
  +<para>gawk is the GNU implementation of awk, a pattern scanning and
  +processing language.</para></sect4>
   
   <sect4><title>grcat</title>
   <para>grcat concatenates the group database,
  
  
  
  1.2       +1 -0      LFS/BOOK/appendixa/gawk.xml
  
  Index: gawk.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/appendixa/gawk.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- gawk.xml	9 Mar 2002 02:54:26 -0000	1.1
  +++ gawk.xml	11 Jan 2003 17:41:17 -0000	1.2
  @@ -3,6 +3,7 @@
   <?dbhtml filename="gawk.html" dir="appendixa"?>
   
   &aa-gawk-down;
  +&aa-gawk-shortdesc;
   &aa-gawk-desc;
   &aa-gawk-dep;
   
  
  
  
  1.1                  LFS/BOOK/appendixa/gawk-shortdesc.xml
  
  Index: gawk-shortdesc.xml
  ===================================================================
  <sect2><title>Contents of Gawk</title>
  
  <para>Last checked against version &gawk-contversion;.</para>
  
  <para>Gawk is an awk implementation that is used to manipulate text
  files.</para>
  
  <para>Gawk installs the following:</para>
  
  <sect3><title>Program Files</title>
  <para>awk, gawk, gawk-3.1.1, grcat, igawk, pgawk, pgawk-3.1.1,
  pwcat</para></sect3>
  
  </sect2>
  
  
  
  1.38      +1 -1      LFS/BOOK/chapter05/bash-inst.xml
  
  Index: bash-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/bash-inst.xml,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- bash-inst.xml	11 Jan 2003 16:42:50 -0000	1.37
  +++ bash-inst.xml	11 Jan 2003 17:41:17 -0000	1.38
  @@ -54,7 +54,7 @@
   there.</para></listitem>
   </itemizedlist>
   
  -<para>Now we can continue compiling Bash:</para>
  +<para>Now we can continue with compiling Bash:</para>
   
   <para><screen><userinput>make</userinput></screen></para>
   
  
  
  
  1.19      +6 -3      LFS/BOOK/chapter05/binutils-inst.xml
  
  Index: binutils-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/binutils-inst.xml,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- binutils-inst.xml	11 Jan 2003 16:42:50 -0000	1.18
  +++ binutils-inst.xml	11 Jan 2003 17:41:17 -0000	1.19
  @@ -29,10 +29,9 @@
   statically.</para></listitem>
   </itemizedlist>
   
  -<para>We'll finish off by compiling and installing the package:</para>
  +<para>Continue with compiling the package:</para>
   
  -<para><screen><userinput>make LDFLAGS="-all-static" &&
  -make install</userinput></screen></para>
  +<para><screen><userinput>make LDFLAGS="-all-static"</userinput></screen></para>
   
   <para>The meaning of the make option is:</para>
   
  @@ -45,6 +44,10 @@
   are different ways of setting up the <emphasis>LDFLAGS</emphasis>
   variable.</para></listitem>
   </itemizedlist>
  +
  +<para>And finish off installing the package:</para>
  +
  +<para><screen><userinput>make install</userinput></screen></para>
   
   </sect2>
   
  
  
  
  1.24      +10 -4     LFS/BOOK/chapter05/bzip2-inst.xml
  
  Index: bzip2-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/bzip2-inst.xml,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- bzip2-inst.xml	11 Jan 2003 16:43:41 -0000	1.23
  +++ bzip2-inst.xml	11 Jan 2003 17:41:17 -0000	1.24
  @@ -8,19 +8,25 @@
   program and start compiling, with a few variables changed to suit our
   environment:</para>
   
  -<para><screen><userinput>make CC="gcc -static -s"
  -make PREFIX=$LFS/static install</userinput></screen></para>
  +<para><screen><userinput>make CC="gcc -static -s"</userinput></screen></para>
   
  -<para>The meaning of the make options are:</para>
  +<para>The meaning of the make option is:</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>
  +</itemizedlist>
  +
  +<para>And finish off installing the package:</para>
  +
  +<para><screen><userinput>make PREFIX=$LFS/static install</userinput></screen></para>
   
  +<para>The meaning of the make option is:</para>
  +
  +<itemizedlist>
   <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
  
  
  
  1.18      +6 -3      LFS/BOOK/chapter05/diffutils-inst.xml
  
  Index: diffutils-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/diffutils-inst.xml,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- diffutils-inst.xml	11 Jan 2003 17:06:14 -0000	1.17
  +++ diffutils-inst.xml	11 Jan 2003 17:41:17 -0000	1.18
  @@ -29,10 +29,13 @@
   construction fixes that problem.</para></listitem>
   </itemizedlist>
   
  -<para>Finish off by compiling and installing the package:</para>
  +<para>Continue with compiling the package:</para>
   
  -<para><screen><userinput>make
  -make install</userinput></screen></para>
  +<para><screen><userinput>make</userinput></screen></para>
  +
  +<para>And finish off installing the package:</para>
  +
  +<para><screen><userinput>make install</userinput></screen></para>
   
   </sect2>
   
  
  
  
  1.47      +10 -4     LFS/BOOK/chapter05/fileutils-inst.xml
  
  Index: fileutils-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/fileutils-inst.xml,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- fileutils-inst.xml	11 Jan 2003 17:06:14 -0000	1.46
  +++ fileutils-inst.xml	11 Jan 2003 17:41:17 -0000	1.47
  @@ -25,12 +25,18 @@
   
   <para><screen><userinput>patch -Np1 -i ../fileutils-&fileutils-patch-version;.patch</userinput></screen></para>
   
  -<para>Install Fileutils by running the following commands:</para>
  +<para>Prepare the package to be compiled:</para>
   
   <para><screen><userinput>LDFLAGS="-static" \
  -    ./configure --disable-nls --prefix=$LFS/static
  -make
  -make install</userinput></screen></para>
  +    ./configure --disable-nls --prefix=$LFS/static</userinput></screen></para>
  +
  +<para>Continue with compiling the package:</para>
  +
  +<para><screen><userinput>make</userinput></screen></para>
  +
  +<para>And finsh off installing the package:</para>
  +
  +<para><screen><userinput>make install</userinput></screen></para>
   
   <para>Once you have installed Fileutils, you can test whether the
   segmentation fault problem has been avoided by running
  
  
  
  1.14      +10 -4     LFS/BOOK/chapter05/findutils-inst.xml
  
  Index: findutils-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/findutils-inst.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- findutils-inst.xml	11 Jan 2003 17:19:41 -0000	1.13
  +++ findutils-inst.xml	11 Jan 2003 17:41:17 -0000	1.14
  @@ -10,11 +10,17 @@
   
   <para><screen><userinput>patch -Np1 -i ../findutils-&findutils-patch-version;.patch</userinput></screen></para>
   
  -<para>Install Findutils by running the following:</para>
  +<para>Prepare Findutils to be compiled:</para>
   
   <para><screen><userinput>CPPFLAGS="-Dre_max_failures=re_max_failures2" \
  -    LDFLAGS="-static" ./configure --prefix=$LFS/static
  -make
  -make install</userinput></screen></para>
  +    LDFLAGS="-static" ./configure --prefix=$LFS/static</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>
   
   </sect2>
  
  
  
  1.19      +12 -4     LFS/BOOK/chapter05/gawk-inst.xml
  
  Index: gawk-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/gawk-inst.xml,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- gawk-inst.xml	3 Jan 2003 03:55:07 -0000	1.18
  +++ gawk-inst.xml	11 Jan 2003 17:41:17 -0000	1.19
  @@ -1,12 +1,20 @@
  +<sect2><title> </title><para> </para></sect2>
  +
   <sect2>
   <title>Installation of Gawk</title>
   
  -<para>Install Gawk by running the following commands:</para>
  +<para>Prepare Gawk to be compiled:</para>
   
   <para><screen><userinput>CPPFLAGS=-Dre_max_failures=re_max_failures2 \
  -    LDFLAGS="-static" ./configure --prefix=$LFS/static --disable-nls &&
  -make &&
  -make install</userinput></screen></para>
  +    LDFLAGS="-static" ./configure --prefix=$LFS/static --disable-nls</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>
   
   </sect2>
   
  
  
  
  1.2       +2 -2      LFS/BOOK/chapter05/gawk.xml
  
  Index: gawk.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/gawk.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- gawk.xml	9 Mar 2002 02:54:58 -0000	1.1
  +++ gawk.xml	11 Jan 2003 17:41:17 -0000	1.2
  @@ -5,9 +5,9 @@
   <screen>Estimated build time:           &gawk-time-static;
   Estimated required disk space:  &gawk-compsize-static;</screen>
   
  -&c5-gawk-inst;
  -&aa-gawk-desc;
  +&aa-gawk-shortdesc;
   &aa-gawk-dep;
  +&c5-gawk-inst;
   
   </sect1>
   
  
  
  
  1.14      +1 -0      LFS/BOOK/entities/gawk.ent
  
  Index: gawk.ent
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/entities/gawk.ent,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- gawk.ent	3 Jan 2003 03:27:03 -0000	1.13
  +++ gawk.ent	11 Jan 2003 17:41:17 -0000	1.14
  @@ -9,6 +9,7 @@
   <!ENTITY c6-gawk-exp SYSTEM "../chapter06/gawk-exp.xml">
   
   <!ENTITY aa-gawk SYSTEM "../appendixa/gawk.xml">
  +<!ENTITY aa-gawk-shortdesc SYSTEM "../appendixa/gawk-shortdesc.xml">
   <!ENTITY aa-gawk-desc SYSTEM "../appendixa/gawk-desc.xml">
   <!ENTITY aa-gawk-dep SYSTEM "../appendixa/gawk-dep.xml">
   <!ENTITY aa-gawk-down SYSTEM "../appendixa/gawk-down.xml">
  
  
  
-- 
Unsubscribe: send email to listar at linuxfromscratch.org
and put 'unsubscribe lfs-book' in the subject header of the message



More information about the lfs-book mailing list