diff options
| author | Mark Hymers <markh@linuxfromscratch.org> | 2001-09-06 15:44:47 +0000 |
|---|---|---|
| committer | Mark Hymers <markh@linuxfromscratch.org> | 2001-09-06 15:44:47 +0000 |
| commit | 37af5ac848fa702b390973d725d51eeac13ce563 (patch) | |
| tree | ebdac5289024c447137e7e230fc9d608cb3529de | |
| parent | 7619a5a7177db622f73680048919cfffade7db8d (diff) | |
[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
| -rw-r--r-- | chapter01/changelog.xml | 4 | ||||
| -rw-r--r-- | chapter05/diffutils-inst.xml | 2 | ||||
| -rw-r--r-- | chapter05/grep-inst.xml | 13 | ||||
| -rw-r--r-- | chapter05/sed-inst.xml | 13 | ||||
| -rw-r--r-- | index.xml | 4 |
5 files changed, 31 insertions, 5 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index ca895d1d3..6585a57e3 100644 --- a/chapter01/changelog.xml +++ b/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 diff --git a/chapter05/diffutils-inst.xml b/chapter05/diffutils-inst.xml index f84a4321f..c10da0f8d 100644 --- a/chapter05/diffutils-inst.xml +++ b/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 &&</userinput> <userinput>make LDFLAGS=-static &&</userinput> diff --git a/chapter05/grep-inst.xml b/chapter05/grep-inst.xml index f6635c56c..945da319d 100644 --- a/chapter05/grep-inst.xml +++ b/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 &&</userinput> <userinput>./configure --prefix=$LFS/usr --disable-nls &&</userinput> <userinput>unset CPPFLAGS &&</userinput> <userinput>make LDFLAGS=-static &&</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 &&</userinput> +<userinput>make LDFLAGS=-static &&</userinput> +<userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter05/sed-inst.xml b/chapter05/sed-inst.xml index 261fe36b0..82b4d4978 100644 --- a/chapter05/sed-inst.xml +++ b/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 &&</userinput> <userinput>./configure --prefix=$LFS/usr --bindir=$LFS/bin &&</userinput> <userinput>unset CPPFLAGS &&</userinput> <userinput>make LDFLAGS=-static &&</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 &&</userinput> +<userinput>make LDFLAGS=-static &&</userinput> +<userinput>make install</userinput></screen></para> </sect2> @@ -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"> |