aboutsummaryrefslogtreecommitdiffstats
path: root/chapter05
diff options
context:
space:
mode:
authorGerard Beekmans <gerard@linuxfromscratch.org>2001-06-20 04:43:00 +0000
committerGerard Beekmans <gerard@linuxfromscratch.org>2001-06-20 04:43:00 +0000
commit84479a6efdd209444715c827c1c4e0d8b672ee1d (patch)
treee41a7257fe585501471116b98d00aaf2f63e4211 /chapter05
parentdb6cd3f71a49ed39657a438d582a5edbcb7fdaa6 (diff)
Updated to current versions
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@685 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter05')
-rw-r--r--chapter05/gcc-inst.xml9
-rw-r--r--chapter05/kernel-inst.xml2
-rw-r--r--chapter05/texinfo-inst.xml2
3 files changed, 6 insertions, 7 deletions
diff --git a/chapter05/gcc-inst.xml b/chapter05/gcc-inst.xml
index c7832bd96..5ff7c5473 100644
--- a/chapter05/gcc-inst.xml
+++ b/chapter05/gcc-inst.xml
@@ -8,16 +8,11 @@ Install GCC by running the following commands:
<blockquote><literallayout>
<userinput>mkdir $LFS/usr/src/gcc-build &amp;&amp;</userinput>
<userinput>cd $LFS/usr/src/gcc-build &amp;&amp;</userinput>
- <userinput>../gcc-2.95.2.1/configure --prefix=/usr \</userinput>
- <userinput>&nbsp;&nbsp;&nbsp;--with-gxx-include-dir=/usr/include/g++
- \</userinput>
+ <userinput>../gcc-&gcc-version;/configure --prefix=/usr \</userinput>
<userinput>&nbsp;&nbsp;&nbsp;--enable-languages=c,c++ --disable-nls
&amp;&amp;</userinput>
<userinput>make -e LDFLAGS=-static bootstrap &amp;&amp;</userinput>
- <userinput>make prefix=$LFS/usr local_prefix=$LFS/usr/local
- \</userinput>
- <userinput>&nbsp;&nbsp;&nbsp;gxx_include_dir=$LFS/usr/include/g++
- install &amp;&amp;</userinput>
+ <userinput>make prefix=$LFS/usr install &amp;&amp;</userinput>
<userinput>cd $LFS/lib &amp;&amp;</userinput>
<userinput>ln -s ../usr/bin/cpp
&amp;&amp;</userinput>
diff --git a/chapter05/kernel-inst.xml b/chapter05/kernel-inst.xml
index 50ace44bb..a12a517b1 100644
--- a/chapter05/kernel-inst.xml
+++ b/chapter05/kernel-inst.xml
@@ -14,6 +14,8 @@ The kernel configuration file is created by running the following command:
</para>
<blockquote><literallayout>
+ <userinput>patch -Np1 -i ../linux-&kernel-version;.patch
+ &amp;&amp;</userinput>
<userinput>make mrproper &amp;&amp;</userinput>
<userinput>yes "" | make config &amp;&amp;</userinput>
<userinput>make dep &amp;&amp;</userinput>
diff --git a/chapter05/texinfo-inst.xml b/chapter05/texinfo-inst.xml
index 317630604..358f09f66 100644
--- a/chapter05/texinfo-inst.xml
+++ b/chapter05/texinfo-inst.xml
@@ -6,6 +6,8 @@ Install Texinfo by running the following commands:
</para>
<blockquote><literallayout>
+ <userinput>patch -Np1 -i ../texinfo-&texinfo-version;.patch
+ &amp;&amp;</userinput>
<userinput>./configure --prefix=$LFS/usr
--disable-nls &amp;&amp;</userinput>
<userinput>make LDFLAGS=-static &amp;&amp;</userinput>