Bladeren bron

[Bug 162] seperate patch commands in chap5 from main commands

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@1187 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Mark Hymers 24 jaren geleden
bovenliggende
commit
37af5ac848
5 gewijzigde bestanden met toevoegingen van 31 en 5 verwijderingen
  1. 4 0
      chapter01/changelog.xml
  2. 1 1
      chapter05/diffutils-inst.xml
  3. 12 1
      chapter05/grep-inst.xml
  4. 12 1
      chapter05/sed-inst.xml
  5. 2 2
      index.xml

+ 4 - 0
chapter01/changelog.xml

@@ -5,6 +5,10 @@
 
 <itemizedlist>
 
+<listitem><para>September 6th, 2001 [markh]: Chapter 5 - Diffutils, Grep
+and Sed: Moved the export CPPFLAGS fixes out of the main install
+instructions and explained when they are necessary.</para></listitem>
+
 <listitem><para>September 5th, 2001 [markh]: Chapter 5 - Gzip and
 Sh-utils: Moved the patches out of the main install instructions to a
 seperate section as we already do with the tar patch.  Also removed

+ 1 - 1
chapter05/diffutils-inst.xml

@@ -14,7 +14,7 @@ use the first version.</para>
 <userinput>make install</userinput></screen></para>
 
 <para>If you are using a newer glibc version (2.2.x), you can use the following
-commands to install diffutils:</para>
+commands to install Diffutils:</para>
 
 <para><screen><userinput>./configure --prefix=$LFS/usr &amp;&amp;</userinput>
 <userinput>make LDFLAGS=-static &amp;&amp;</userinput>

+ 12 - 1
chapter05/grep-inst.xml

@@ -1,13 +1,24 @@
 <sect2>
 <title>Installation of Grep</title>
 
-<para>Install Grep by running the following commands:</para>
+<para>When installing Grep using glibc-2.1.x on your base system,
+it may be necessary to use a fix to prevent a variable name conflict.  The
+following commands can be used in this case.  Note that these commands
+can also be used for other glibc versions so if you aren't sure, then
+use the first version.</para>
 
 <para><screen><userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &amp;&amp;</userinput>
 <userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;</userinput>
 <userinput>unset CPPFLAGS &amp;&amp;</userinput>
 <userinput>make LDFLAGS=-static &amp;&amp;</userinput>
 <userinput>make install</userinput></screen></para>
+ 
+<para>If you are using a newer glibc version (2.2.x), you can use the
+following commands to install Grep:</para>
+ 
+<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;</userinput>
+<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
+<userinput>make install</userinput></screen></para>
 
 </sect2>
 

+ 12 - 1
chapter05/sed-inst.xml

@@ -1,13 +1,24 @@
 <sect2>
 <title>Installation of Sed</title>
 
-<para>Install Sed by running the following commands:</para>
+<para>When installing Sed using glibc-2.1.x on your base system,
+it may be necessary to use a fix to prevent a variable name conflict.  The
+following commands can be used in this case.  Note that these commands
+can also be used for other glibc versions so if you aren't sure, then
+use the first version.</para>
 
 <para><screen><userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &amp;&amp;</userinput>
 <userinput>./configure --prefix=$LFS/usr --bindir=$LFS/bin &amp;&amp;</userinput>
 <userinput>unset CPPFLAGS &amp;&amp;</userinput>
 <userinput>make LDFLAGS=-static &amp;&amp;</userinput>
 <userinput>make install</userinput></screen></para>
+ 
+<para>If you are using a newer glibc version (2.2.x), you can use the
+following commands to install Sed:</para>
+ 
+<para><screen><userinput>./configure --prefix=$LFS/usr --bindir=$LFS/bin &amp;&amp;</userinput>
+<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
+<userinput>make install</userinput></screen></para>
 
 </sect2>
 

+ 2 - 2
index.xml

@@ -4,8 +4,8 @@
 
 <!ENTITY book SYSTEM "book/book.xml">
 
-<!ENTITY version "20010905">
-<!ENTITY releasedate "September 5th, 2001">
+<!ENTITY version "20010906">
+<!ENTITY releasedate "September 6th, 2001">
 
 <!ENTITY ftp-root "ftp://ftp.linuxfromscratch.org">
 <!ENTITY http-root "http://ftp.linuxfromscratch.org">