Updated to current versions

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@685 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

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>

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>

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>

chapter06/bin86-inst.xml

@@ -7,8 +7,7 @@ Install Bin86 by running the following commands:
 
 <blockquote><literallayout>
 	<userinput>make &amp;&amp;</userinput>
-	<userinput>make INSTALL_OPTS="-m 755" 
-		PREFIX=/usr install</userinput>
+	<userinput>make PREFIX=/usr install</userinput>
 </literallayout></blockquote>
 
 </sect2>

chapter06/bin86.xml

@@ -2,7 +2,6 @@
 <title>Installing Bin86</title>
 
 &c6-bin86-inst;
-&c6-bin86-exp;
 &aa-bin86-desc;
 
 </sect1>

chapter06/gcc-inst.xml

@@ -8,11 +8,11 @@ Install GCC by running the following commands:
 <blockquote><literallayout>
 	<userinput>mkdir /usr/src/gcc-build &amp;&amp;</userinput>
 	<userinput>cd /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>&nbsp;&nbsp;&nbsp;--enable-shared 
-		--enable-languages=c,c++ &amp;&amp;</userinput>
+	<userinput>../gcc-&gcc-version;/configure --prefix=/usr \</userinput>
+	<userinput>&nbsp;&nbsp;&nbsp;--with-slibdir=/lib
+		--enable-shared \</userinput>
+	<userinput>&nbsp;&nbsp;&nbsp;--enable-languages=c,c++
+		&amp;&amp;</userinput>
 	<userinput>make bootstrap &amp;&amp;</userinput>
 	<userinput>make install</userinput>
 </literallayout></blockquote>

chapter06/glibc-inst.xml

@@ -2,7 +2,7 @@
 <title>Installation of Glibc</title>
 
 <para>
-Unpack the glibc-linuxthreads in the glibc-2.2.1 directory, not in 
+Unpack the glibc-linuxthreads in the glibc-&glibc-version; directory, not in 
 /usr/src. 
 </para>
 
@@ -16,15 +16,15 @@ Install Glibc by running the following commands:
 	<userinput>mkdir /usr/src/glibc-build &amp;&amp;</userinput>
 	<userinput>cd /usr/src/glibc-build &amp;&amp;</userinput>
 	<userinput>sed s/"\$(PERL)"/"\/usr\/bin\/perl"/ \</userinput>
-	<userinput>&nbsp;&nbsp;&nbsp;../glibc-2.2.1/malloc/Makefile
+	<userinput>&nbsp;&nbsp;&nbsp;../glibc-&glibc-version;/malloc/Makefile
 		&gt; tmp~ &amp;&amp;</userinput>
-	<userinput>mv tmp~ ../glibc-2.2.1/malloc/Makefile &amp;&amp;
+	<userinput>mv tmp~ ../glibc-&glibc-version;/malloc/Makefile &amp;&amp;
 		</userinput>
-	<userinput>sed "s/root/0/" ../glibc-2.2.1/login/Makefile 
+	<userinput>sed "s/root/0/" ../glibc-&glibc-version;/login/Makefile 
 		&gt; tmp~ &amp;&amp; </userinput>
-	<userinput>mv tmp~ ../glibc-2.2.1/login/Makefile &amp;&amp;
+	<userinput>mv tmp~ ../glibc-&glibc-version;/login/Makefile &amp;&amp;
 		</userinput>
-	<userinput>../glibc-2.2.1/configure \</userinput>
+	<userinput>../glibc-&glibc-version;/configure \</userinput>
 	<userinput>&nbsp;&nbsp;&nbsp;--prefix=/usr --enable-add-ons 
 		\</userinput>
 	<userinput>&nbsp;&nbsp;&nbsp;--libexecdir=/usr/bin &amp;&amp;

chapter06/groff-inst.xml

@@ -6,7 +6,8 @@ Install Groff by running the following commands:
 </para>
 
 <blockquote><literallayout>
-	<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
+	<userinput>CXXFLAGS=-Dstrerror=strerror ./configure --prefix=/usr
+		&amp;&amp;</userinput>
 	<userinput>make &amp;&amp;</userinput>
 	<userinput>make install</userinput>
 </literallayout></blockquote>

chapter06/ncurses-inst.xml

@@ -6,6 +6,8 @@ Install Ncurses by running the following commands:
 </para>
 
 <blockquote><literallayout>
+	<userinput>patch -Np1 -i ../ncurses-&ncurses-version;.patch
+		&amp;&amp;</userinput>
 	<userinput>./configure --prefix=/usr --libdir=/lib \</userinput>
 	<userinput>&nbsp;&nbsp;&nbsp;--with-shared 
 		--disable-termcap &amp;&amp;</userinput>

chapter06/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=/usr &amp;&amp;</userinput>
 	<userinput>make &amp;&amp;</userinput>
 	<userinput>make install &amp;&amp;</userinput>