[lfs-fr] r6586 - in trunk/clfs: . cross-tools/common final-system/multilib introduction/common

jmengual at linuxfromscratch.org jmengual at linuxfromscratch.org
Ven 10 Oct 21:54:12 PDT 2014


Author: jmengual
Date: 2014-10-11 06:54:10 +0200 (Sat, 11 Oct 2014)
New Revision: 6586

Modified:
   trunk/clfs/cross-tools/common/gcc-static.xml
   trunk/clfs/cross-tools/common/gmp.xml
   trunk/clfs/cross-tools/common/isl.xml
   trunk/clfs/cross-tools/common/m4.xml
   trunk/clfs/cross-tools/common/mpc.xml
   trunk/clfs/final-system/multilib/bzip2-64bit.xml
   trunk/clfs/final-system/multilib/bzip2-n32.xml
   trunk/clfs/final-system/multilib/bzip2.xml
   trunk/clfs/final-system/multilib/cloog-64bit.xml
   trunk/clfs/final-system/multilib/cloog-n32.xml
   trunk/clfs/final-system/multilib/cloog.xml
   trunk/clfs/final-system/multilib/coreutils.xml
   trunk/clfs/final-system/multilib/diffutils.xml
   trunk/clfs/final-system/multilib/e2fsprogs-64bit.xml
   trunk/clfs/final-system/multilib/e2fsprogs-n32.xml
   trunk/clfs/final-system/multilib/e2fsprogs.xml
   trunk/clfs/final-system/multilib/findutils.xml
   trunk/clfs/final-system/multilib/flex-64bit.xml
   trunk/clfs/final-system/multilib/flex-n32.xml
   trunk/clfs/final-system/multilib/flex.xml
   trunk/clfs/final-system/multilib/gawk.xml
   trunk/clfs/final-system/multilib/gcc.xml
   trunk/clfs/final-system/multilib/gettext-64bit.xml
   trunk/clfs/final-system/multilib/gettext-n32.xml
   trunk/clfs/final-system/multilib/gettext.xml
   trunk/clfs/final-system/multilib/gmp-64bit.xml
   trunk/clfs/final-system/multilib/gmp-n32.xml
   trunk/clfs/final-system/multilib/gmp.xml
   trunk/clfs/final-system/multilib/groff.xml
   trunk/clfs/final-system/multilib/gzip.xml
   trunk/clfs/final-system/multilib/iproute2.xml
   trunk/clfs/final-system/multilib/iputils.xml
   trunk/clfs/final-system/multilib/isl-64bit.xml
   trunk/clfs/final-system/multilib/isl-n32.xml
   trunk/clfs/final-system/multilib/isl.xml
   trunk/clfs/final-system/multilib/kbd.xml
   trunk/clfs/final-system/multilib/kmod-64bit.xml
   trunk/clfs/final-system/multilib/kmod-n32.xml
   trunk/clfs/final-system/multilib/kmod.xml
   trunk/clfs/final-system/multilib/less.xml
   trunk/clfs/final-system/multilib/mpc-64bit.xml
   trunk/clfs/final-system/multilib/mpc-n32.xml
   trunk/clfs/final-system/multilib/mpc.xml
   trunk/clfs/final-system/multilib/mpfr-64bit.xml
   trunk/clfs/final-system/multilib/mpfr-n32.xml
   trunk/clfs/final-system/multilib/mpfr.xml
   trunk/clfs/final-system/multilib/ncurses-64bit.xml
   trunk/clfs/final-system/multilib/ncurses-n32.xml
   trunk/clfs/final-system/multilib/ncurses.xml
   trunk/clfs/introduction/common/changelog.xml
   trunk/clfs/maj
Log:
Poursuite maj


Modified: trunk/clfs/cross-tools/common/gcc-static.xml
===================================================================
--- trunk/clfs/cross-tools/common/gcc-static.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/cross-tools/common/gcc-static.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -128,7 +128,9 @@
       <varlistentry>
         <term><parameter>--with-newlib</parameter></term>
         <listitem>
-          <para>Dit à GCC que la libc cible utilisera 'newlib'.</para>
+          <para>Ceci amène GCC à activer le drapeau <envar>inhibit_libc</envar>,
+          qui empêche <filename class="libraryfile">libgcc</filename> de
+          construire du code utilisant le support libc.</para>
         </listitem>
       </varlistentry>
 
@@ -141,22 +143,14 @@
       </varlistentry>
 
       <varlistentry>
-        <term><parameter>--disable-libgomp</parameter></term>
+        <term><parameter>--disable-lib*</parameter></term>
         <listitem>
-          <para>Désactive la création de bibliothèques utilisées au moment de 
-          l'exécution de GOMP.</para>
+          <para>Ces options empêchent GCC de construire un certain nombre de
+          bibliothèques inutiles pour l'instant.</para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><parameter>--disable-libmudflap</parameter></term>
-        <listitem>
-          <para>Désactive la création des bibliothèques utilisées au moment de
-          l'exécution par libmudflap.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
         <term><parameter>--disable-libssp</parameter></term>
         <listitem>
           <para>Désactive l'utilisation de <foreignphrase>Stack Smashing 
@@ -174,34 +168,22 @@
       </varlistentry>
 
       <varlistentry>
-        <term><parameter>--disable-libatomic</parameter></term>
+        <term><parameter>--disable-target-zlib</parameter></term>
         <listitem>
-          <para>La bibliothèque atomic n'est pas nécessaire pour le moment.</para>
+         <para>Ceci dit à GCC de ne pas construire la copie de Zlib de
+         l'arborescence de ses sources.</para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><parameter>--disable-libitm</parameter></term>
+        <term><parameter>--with-system-zlib</parameter></term>
         <listitem>
-          <para>La bibliothèque itm n'est pas nécessaire pour le moment.</para>
+          <para>Ceci dit à GCC de se lier au zlib installé sur le szstème au
+          lieu de celle dans l'arborescence de ses sources.</para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><parameter>--disable-libsanitizer</parameter></term>
-        <listitem>
-         <para>La bibliothèque sanitizer n'est pas nécessaire pour le moment.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--disable-libquadmath</parameter></term>
-        <listitem>
-          <para>La bibliothèque quadmath n'est pas nécessaire pour le moment.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
         <term><parameter>--enable-languages=c</parameter></term>
         <listitem>
           <para>Cette option nous assure que seul le compilateur C sera construit.</para>

Modified: trunk/clfs/cross-tools/common/gmp.xml
===================================================================
--- trunk/clfs/cross-tools/common/gmp.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/cross-tools/common/gmp.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -12,7 +12,7 @@
 
   <indexterm zone="ch-cross-tools-gmp">
     <primary sortas="a-GMP">GMP</primary>
-    <secondary>cross-tools</secondary>
+    <secondary>cross tools</secondary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -30,6 +30,11 @@
     href="../../final-system/common/gmp.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
 -->
+
+    <para>Ce paquet et les deux suivants - MPFR et MPC - seront installés dans
+    <filename class="directory">/cross-tools</filename> car GCC en a besoin pokr
+    se construire.</para>
+
     <note os="n1">
       <para>Si vous construisez sur un hôte où le 32 bits est en espace 
       utilisateur alors qu'il a la capacité 64 bits, l'outil croisé GMP essaiera
@@ -39,8 +44,11 @@
 
     <para os="a">Préparez la compilation de GMP :</para>
 
+<screen os="b"><userinput>./configure --prefix=/cross-tools --enable-cxx \
+    --disable-static</userinput></screen>
+
     <variablelist os="b1">
-      <title>Voici la signification des nouvelles options de configure :</title>
+      <title>Voici la signification de la nouvelle option de configure :</title>
 
       <varlistentry>
         <term><parameter>--enable-cxx</parameter></term> 

Modified: trunk/clfs/cross-tools/common/isl.xml
===================================================================
(Binary files differ)

Modified: trunk/clfs/cross-tools/common/m4.xml
===================================================================
--- trunk/clfs/cross-tools/common/m4.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/cross-tools/common/m4.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -12,7 +12,7 @@
 
   <indexterm zone="ch-cross-tools-m4">
     <primary sortas="a-M4">M4</primary>
-    <secondary>temporary system</secondary>
+    <secondary>outils croisés</secondary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -22,6 +22,12 @@
   <sect2 role="installation">
     <title>Installation de M4</title>
 
+    <para>M4 est nécessaire pour construire GMP. Nous allons compiler et installer
+    un programme <command>m4</command> dans
+    <filename class="directory">/cross-tools</filename>, afin d'avoir une version
+    connue pour pouvoir construire GMP, tant dans les outils croisés que dans
+    le système temporaire.</para>
+
     <para os="a">Préparez la compilation de M4 :</para>
 
 <screen os="b"><userinput>./configure --prefix=/cross-tools</userinput></screen>

Modified: trunk/clfs/cross-tools/common/mpc.xml
===================================================================
--- trunk/clfs/cross-tools/common/mpc.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/cross-tools/common/mpc.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -12,7 +12,7 @@
 
   <indexterm zone="ch-cross-tools-mpc">
     <primary sortas="a-MPC">MPC</primary>
-    <secondary>cross-tools</secondary>
+    <secondary>cross tools</secondary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

Modified: trunk/clfs/final-system/multilib/bzip2-64bit.xml
===================================================================
--- trunk/clfs/final-system/multilib/bzip2-64bit.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/bzip2-64bit.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -29,6 +29,14 @@
     href="bzip2.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='s3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='s4'])"/>
+
     <para os="m1">Il nous faut modifier le chemin par défaut des bibliothèques 
     en <filename class="directory">lib64</filename> :</para>
 

Modified: trunk/clfs/final-system/multilib/bzip2-n32.xml
===================================================================
--- trunk/clfs/final-system/multilib/bzip2-n32.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/bzip2-n32.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -30,6 +30,14 @@
     href="bzip2.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='s3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='s4'])"/>
+
     <para os="m1">Il nous faut modifier le chemin par défaut des bibliothèques 
     en <filename class="directory">lib32</filename>:</para>
 

Modified: trunk/clfs/final-system/multilib/bzip2.xml
===================================================================
--- trunk/clfs/final-system/multilib/bzip2.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/bzip2.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -32,6 +32,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='s3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='s4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/bzip2.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>make -f Makefile-libbz2_so CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}"

Modified: trunk/clfs/final-system/multilib/cloog-64bit.xml
===================================================================
--- trunk/clfs/final-system/multilib/cloog-64bit.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/cloog-64bit.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -27,9 +27,7 @@
 
 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
-  ./configure --prefix=/usr \
-    --libdir=/usr/lib64 --enable-shared</userinput></screen>
-
+  ./configure --prefix=/usr --libdir=/usr/lib64 --with-isl=system</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
@@ -62,10 +60,6 @@
     href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

Modified: trunk/clfs/final-system/multilib/cloog-n32.xml
===================================================================
--- trunk/clfs/final-system/multilib/cloog-n32.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/cloog-n32.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -28,8 +28,7 @@
 
 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
-  ./configure --prefix=/usr \
-    --libdir=/usr/lib32 --enable-shared</userinput></screen>
+  ./configure --prefix=/usr --libdir=/usr/lib32 --with-isl=system</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/cloog.xml"
@@ -63,10 +62,6 @@
     href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
   </sect2>
 
   <sect2 role="content">

Modified: trunk/clfs/final-system/multilib/cloog.xml
===================================================================
--- trunk/clfs/final-system/multilib/cloog.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/cloog.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -28,8 +28,7 @@
 
 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
-  ./configure --prefix=/usr \
-    --host=${CLFS_TARGET32} --enable-shared</userinput></screen>
+  ./configure --prefix=/usr --host=${CLFS_TARGET32} --with-isl=system</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/cloog.xml"
@@ -63,10 +62,6 @@
     href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
   </sect2>
 
   <sect2 role="content">

Modified: trunk/clfs/final-system/multilib/coreutils.xml
===================================================================
--- trunk/clfs/final-system/multilib/coreutils.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/coreutils.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -105,10 +105,6 @@
     href="../common/coreutils.xml"
     xpointer="xpointer(//*[@os='t'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

Modified: trunk/clfs/final-system/multilib/diffutils.xml
===================================================================
--- trunk/clfs/final-system/multilib/diffutils.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/diffutils.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -23,17 +23,25 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/diffutils.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/diffutils.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/diffutils.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/diffutils.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
+    xpointer="xpointer(//*[@os='s3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/diffutils.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
+    xpointer="xpointer(//*[@os='s4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/diffutils.xml"

Modified: trunk/clfs/final-system/multilib/e2fsprogs-64bit.xml
===================================================================
--- trunk/clfs/final-system/multilib/e2fsprogs-64bit.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/e2fsprogs-64bit.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -38,8 +38,9 @@
     href="e2fsprogs.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
-  ../configure --prefix=/usr --with-root-prefix="" \
+<screen os="d"><userinput>PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
+CC="gcc ${BUILD64}"  \
+../configure --prefix=/usr --with-root-prefix="" \
     --enable-elf-shlibs --disable-libblkid \
     --disable-libuuid --disable-fsck \
     --disable-uuidd</userinput></screen>

Modified: trunk/clfs/final-system/multilib/e2fsprogs-n32.xml
===================================================================
--- trunk/clfs/final-system/multilib/e2fsprogs-n32.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/e2fsprogs-n32.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -39,8 +39,9 @@
     href="e2fsprogs.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>CC="gcc ${BUILDN32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATHN32}" \
-  ../configure --prefix=/usr --with-root-prefix="" \
+<screen os="d"><userinput>PKG_CONFIG_PATH="${PKG_CONFIG_PATH32}" \
+CC="gcc ${BUILD32}"  \
+../configure --prefix=/usr --with-root-prefix="" \
     --enable-elf-shlibs --disable-libblkid \
     --disable-libuuid --disable-fsck \
     --disable-uuidd</userinput></screen>

Modified: trunk/clfs/final-system/multilib/e2fsprogs.xml
===================================================================
--- trunk/clfs/final-system/multilib/e2fsprogs.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/e2fsprogs.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -34,8 +34,9 @@
     href="../common/e2fsprogs.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>CC="gcc ${BUILD32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH32}" \
-  ../configure --prefix=/usr --with-root-prefix="" \
+<screen os="d"><userinput>PKG_CONFIG_PATH="${PKG_CONFIG_PATH32}" \
+CC="gcc ${BUILD32}" \
+../configure --prefix=/usr --with-root-prefix="" \
     --enable-elf-shlibs --disable-libblkid \
     --disable-libuuid --disable-fsck \
     --disable-uuidd</userinput></screen>

Modified: trunk/clfs/final-system/multilib/findutils.xml
===================================================================
--- trunk/clfs/final-system/multilib/findutils.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/findutils.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -65,22 +65,6 @@
     href="../common/findutils.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
   </sect2>
 
   <sect2 id="contents-findutils" role="content">

Modified: trunk/clfs/final-system/multilib/flex-64bit.xml
===================================================================
--- trunk/clfs/final-system/multilib/flex-64bit.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/flex-64bit.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -26,7 +26,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-    --libdir=/usr/lib64</userinput></screen>
+    --libdir=/usr/lib64 --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="flex.xml"
@@ -45,6 +45,10 @@
     xpointer="xpointer(//*[@os='e2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='e3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="flex.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
@@ -52,19 +56,13 @@
     href="../common/flex.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
-    <para os="h">Certains paquets s'attendent à trouver la bibliothèque 
-    <filename class="libraryfile">lex</filename> dans <filename
-    class="directory">/usr/lib64</filename>. Pour cela, créez un lien symbolique :</para>
-
-<screen os="i"><userinput>ln -sv libfl.a /usr/lib64/libl.a</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
+    xpointer="xpointer(//*[@os='i'])"/>
 
   </sect2>
 

Modified: trunk/clfs/final-system/multilib/flex-n32.xml
===================================================================
--- trunk/clfs/final-system/multilib/flex-n32.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/flex-n32.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -26,7 +26,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
-   --libdir=/usr/lib32</userinput></screen>
+   --libdir=/usr/lib32 --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="flex.xml"
@@ -44,12 +44,6 @@
     href="flex.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
-    <para os="h">Certains paquets s'attendent à trouver la bibliothèque 
-    <filename class="libraryfile">lex</filename> dans <filename
-    class="directory">/usr/lib32</filename>. Pour cela, créez un lien symbolique  :</para>
-
-<screen os="i"><userinput>ln -sv libfl.a /usr/lib32/libl.a</userinput></screen>
-
   </sect2>
 
   <sect2 role="content">

Modified: trunk/clfs/final-system/multilib/flex.xml
===================================================================
--- trunk/clfs/final-system/multilib/flex.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/flex.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -26,28 +26,21 @@
     href="../common/flex.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr \
+    --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/flex.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>make libfl.a</userinput></screen>
+<screen os="d"><userinput>make</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/flex.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
-<screen os="g"><userinput>make install-libLIBRARIES</userinput></screen>
+<screen os="g"><userinput>make install</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
   </sect2>
 
   <sect2 role="content">

Modified: trunk/clfs/final-system/multilib/gawk.xml
===================================================================
--- trunk/clfs/final-system/multilib/gawk.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/gawk.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -52,6 +52,14 @@
     href="../common/gawk.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gawk.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gawk.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

Modified: trunk/clfs/final-system/multilib/gcc.xml
===================================================================
--- trunk/clfs/final-system/multilib/gcc.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/gcc.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -39,14 +39,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -57,16 +49,18 @@
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen os="i"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
+<screen os="i"><userinput>SED=sed CC="gcc -isystem /usr/include ${BUILD64}" \
 CXX="g++ -isystem /usr/include ${BUILD64}" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64:/usr/lib:/lib" \
   ../gcc-&gcc-version;/configure --prefix=/usr --libdir=/usr/lib64 \
-    --libexecdir=/usr/lib64 --enable-shared --enable-threads=posix \
-    --enable-__cxa_atexit --enable-c99 --enable-long-long \
+    --libexecdir=/usr/lib64 --enable-threads=posix --enable-__cxa_atexit \.
     --enable-clocale=gnu --enable-languages=c,c++ --disable-libstdcxx-pch \
-    --enable-cloog-backend=isl --disable-isl-version-check --with-system-zlib \
-    --enable-checking=release --enable-libstdcxx-time \
-    --disable-install-libiberty</userinput></screen>
+    --with-system-zlib --enable-checking=release --enable-libstdcxx-time</userinput></screen>
+
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='i1'])"/>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='j'])"/>
@@ -136,9 +130,10 @@
     xpointer="xpointer(//*[@os='x'])"/>
 
     <para os="y">Enfin, déplacez des fichiers mal placés :</para>
-<screen os="z"><userinput>mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib
-mv -v /usr/lib64/*gdb.py /usr/share/gdb/auto-load/usr/lib64</userinput></screen>
 
+<screen os="z"><userinput>mv -v /usr/lib/libstdc++*gdb.py /usr/share/gdb/auto-load/usr/lib
+mv -v /usr/lib64/libstdc++*gdb.py /usr/share/gdb/auto-load/usr/lib64</userinput></screen>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

Modified: trunk/clfs/final-system/multilib/gettext-64bit.xml
===================================================================
--- trunk/clfs/final-system/multilib/gettext-64bit.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/gettext-64bit.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -26,7 +26,8 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-   ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
+   ./configure --prefix=/usr --libdir=/usr/lib64 \
+   --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
 
    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gettext.xml"

Modified: trunk/clfs/final-system/multilib/gettext-n32.xml
===================================================================
--- trunk/clfs/final-system/multilib/gettext-n32.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/gettext-n32.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -27,7 +27,8 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
-   ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
+   ./configure --prefix=/usr --libdir=/usr/lib32 \
+   --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
 
    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gettext.xml"

Modified: trunk/clfs/final-system/multilib/gettext.xml
===================================================================
--- trunk/clfs/final-system/multilib/gettext.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/gettext.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -27,7 +27,8 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
-   ./configure --prefix=/usr</userinput></screen>
+   ./configure --prefix=/usr \
+   --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gettext.xml"

Modified: trunk/clfs/final-system/multilib/gmp-64bit.xml
===================================================================
--- trunk/clfs/final-system/multilib/gmp-64bit.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/gmp-64bit.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -43,7 +43,8 @@
 CXX="g++ -isystem /usr/include ${BUILD64}" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
   ./configure --prefix=/usr \
-    --libdir=/usr/lib64 --enable-cxx</userinput></screen>
+    --libdir=/usr/lib64 --enable-cxx \
+    --docdir=/usr/share/doc/gmp-&gmp-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gmp.xml"
@@ -73,13 +74,24 @@
     href="../common/gmp.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
-    <para os="j">Créez du fichier d'entêtes 64 bits :</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gmp.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
-<screen os="k"><userinput>mv -v /usr/include/gmp{,-64}.h</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gmp.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
 
-    <para os="l">Finallement, créez un morceau d'entête à la place des originaux:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gmp.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+    <para os="m">Créez le fichier d'en-tête 64 bits :</para>
 
-<screen os="m"><userinput>cat > /usr/include/gmp.h << "EOF"
+<screen os="n"><userinput>mv -v /usr/include/gmp{,-64}.h</userinput></screen>
+
+    <para os="o">Finallement, créez un morceau d'entête à la place des originaux:</para>
+
+<screen os="p"><userinput>cat > /usr/include/gmp.h << "EOF"
 /* gmp.h - Stub Header  */
 #ifndef __STUB__GMP_H__
 #define __STUB__GMP_H__

Modified: trunk/clfs/final-system/multilib/gmp-n32.xml
===================================================================
--- trunk/clfs/final-system/multilib/gmp-n32.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/gmp-n32.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -57,14 +57,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -75,10 +67,14 @@
     href="../common/gmp.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
-    <para os="j">Création du fichier d'entête N32:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gmp.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
-<screen os="k"><userinput>mv -v /usr/include/gmp{,-n32}.h</userinput></screen>
+    <para os="k">Crçez le fichier d'en-tête N32 :</para>
 
+<screen os="l"><userinput>mv -v /usr/include/gmp{,-n32}.h</userinput></screen>
+
   </sect2>
 
   <sect2 role="content">

Modified: trunk/clfs/final-system/multilib/gmp.xml
===================================================================
--- trunk/clfs/final-system/multilib/gmp.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/gmp.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -55,14 +55,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -73,12 +65,17 @@
     href="../common/gmp.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
-    <para os="j">L'entête installé par GMP est spécifique à l'architecture. Les programmes compilés en 32 bits
-	demanderont l'entête fourni par l'installation 32 bits de GMP. De même pour les programmes 64 bits.
-	Déplacez l'entête pour que l'enveloppe puisse le mettre à sa place plus tard:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gmp.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
-<screen os="k"><userinput>mv -v /usr/include/gmp{,-32}.h</userinput></screen>
+    <para os="k">L'en-tête qu'installe GMP est spécifique à l'architecture. Les
+    Programmes compilés en 32 bits auront besoin de l'en-tête de l'installation
+   32 bits de GMP. Il en est de même pour les programmes 64 bits. Déplacez
+   l'en-tâte pour qu'une enveloppe puisse la remplacer plus tard :</para>
 
+<screen os="l"><userinput>mv -v /usr/include/gmp{,-32}.h</userinput></screen>
+
   </sect2>
 
   <sect2 role="content">

Modified: trunk/clfs/final-system/multilib/groff.xml
===================================================================
--- trunk/clfs/final-system/multilib/groff.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/groff.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -53,14 +53,6 @@
     href="../common/groff.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/groff.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/groff.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

Modified: trunk/clfs/final-system/multilib/gzip.xml
===================================================================
--- trunk/clfs/final-system/multilib/gzip.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/gzip.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -39,9 +39,7 @@
     href="../common/gzip.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
+<screen><userinput remap="test">make PERL=perl-64 check</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gzip.xml"

Modified: trunk/clfs/final-system/multilib/iproute2.xml
===================================================================
--- trunk/clfs/final-system/multilib/iproute2.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/iproute2.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -29,14 +29,6 @@
     href="../common/iproute2.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/iproute2.xml"
-    xpointer="xpointer(//*[@os='f1'])"/>
-    
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/iproute2.xml"
-    xpointer="xpointer(//*[@os='f2'])"/>
-
     <para os="p1">Le correctif suivant permet de mettre à jour le contenu de LIBDIR :</para>
 
 <screen os="p2"><userinput>patch -Np1 -i ../&iproute2-libdir-patch;</userinput></screen>
@@ -45,8 +37,7 @@
     href="../common/iproute2.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>make CC="gcc ${BUILD64}" DESTDIR= LIBDIR=/usr/lib64 \
-    DOCDIR=/usr/share/doc/iproute2 MANDIR=/usr/share/man</userinput></screen>
+<screen os="b"><userinput>make CC="gcc ${BUILD64}" LIBDIR=/usr/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/iproute2.xml"
@@ -56,14 +47,9 @@
     href="../common/iproute2.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/iproute2.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
+<screen os="e"><userinput>make LIBDIR=/usr/lib64 \
+    DOCDIR=/usr/share/doc/iproute2-&iproute2-version; install</userinput></screen>
 
-<screen os="f"><userinput>make DESTDIR= LIBDIR=/usr/lib64 \
-    DOCDIR=/usr/share/doc/iproute2 \
-    MANDIR=/usr/share/man install</userinput></screen>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

Modified: trunk/clfs/final-system/multilib/iputils.xml
===================================================================
--- trunk/clfs/final-system/multilib/iputils.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/iputils.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -33,7 +33,7 @@
     href="../common/iputils.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>make USE_CAP=no CC="gcc ${BUILD64}" \
+<screen os="b"><userinput>make CC="gcc ${BUILD64}" \
     IPV4_TARGETS="tracepath ping clockdiff rdisc" \
     IPV6_TARGETS="tracepath6 traceroute6"</userinput></screen>
 

Modified: trunk/clfs/final-system/multilib/isl-64bit.xml
===================================================================
--- trunk/clfs/final-system/multilib/isl-64bit.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/isl-64bit.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -57,11 +57,7 @@
     href="../common/isl.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/isl.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-<screen os="k"><userinput>mkdir -pv /usr/share/gdb/auto-load/usr/lib64
+<screen os="j"><userinput>mkdir -pv /usr/share/gdb/auto-load/usr/lib64
 mv -v /usr/lib64/*gdb.py /usr/share/gdb/auto-load/usr/lib64</userinput></screen>
   </sect2>
 

Modified: trunk/clfs/final-system/multilib/isl-n32.xml
===================================================================
--- trunk/clfs/final-system/multilib/isl-n32.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/isl-n32.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -58,11 +58,7 @@
     href="../common/isl.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/isl.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-<screen os="k"><userinput>mkdir -pv /usr/share/gdb/auto-load/usr/lib32
+<screen os="j"><userinput>mkdir -pv /usr/share/gdb/auto-load/usr/lib32
 mv -v /usr/lib32/*gdb.py /usr/share/gdb/auto-load/usr/lib32</userinput></screen>
   </sect2>
 

Modified: trunk/clfs/final-system/multilib/isl.xml
===================================================================
--- trunk/clfs/final-system/multilib/isl.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/isl.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -62,10 +62,6 @@
     href="../common/isl.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/isl.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
   </sect2>
 
   <sect2 role="content">

Modified: trunk/clfs/final-system/multilib/kbd.xml
===================================================================
--- trunk/clfs/final-system/multilib/kbd.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/kbd.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -32,7 +32,9 @@
     href="../common/kbd.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/kbd.xml"
@@ -54,6 +56,22 @@
     href="../common/kbd.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

Modified: trunk/clfs/final-system/multilib/kmod-64bit.xml
===================================================================
--- trunk/clfs/final-system/multilib/kmod-64bit.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/kmod-64bit.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -26,10 +26,10 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATH64} CC="gcc ${BUILD64}" \
-        ./configure --prefix=/usr \
-        --bindir=/bin --sysconfdir=/etc \
-        --with-rootlibdir=/lib64 --libdir=/usr/lib64 \
-        --with-zlib --with-xz --disable-manpages</userinput></screen>
+  ./configure --prefix=/usr \
+    --bindir=/bin --sysconfdir=/etc \
+    --with-rootlibdir=/lib64 --libdir=/usr/lib64 \
+    --with-zlib --with-xz</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/kmod.xml"

Modified: trunk/clfs/final-system/multilib/kmod-n32.xml
===================================================================
--- trunk/clfs/final-system/multilib/kmod-n32.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/kmod-n32.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -26,11 +26,12 @@
     href="../common/kmod.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-    <screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATH32} CC="gcc ${BUILD32}" \
-            ./configure --prefix=/usr \
-            --bindir=/bin --sysconfdir=/etc \
-            --with-rootlibdir=/lib32 --libdir=/usr/lib32 \
-            --with-zlib --with-xz --disable-manpages</userinput></screen>
+<screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATH32} CC="gcc ${BUILD32}" \
+  ./configure --prefix=/usr \
+    --bindir=/bin --sysconfdir=/etc \
+    --with-rootlibdir=/lib32 --libdir=/usr/lib32 \
+    --with-zlib --with-xz</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/kmod.xml"
     xpointer="xpointer(//*[@os='c'])"/>

Modified: trunk/clfs/final-system/multilib/kmod.xml
===================================================================
--- trunk/clfs/final-system/multilib/kmod.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/kmod.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -27,10 +27,10 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATH32} CC="gcc ${BUILD32}" \
-        ./configure --prefix=/usr \
-        --bindir=/bin --sysconfdir=/etc \
-        --with-rootlibdir=/lib --libdir=/usr/lib \
-        --with-zlib --with-xz --disable-manpages</userinput></screen>
+  ./configure --prefix=/usr \
+    --bindir=/bin --sysconfdir=/etc \
+    --with-rootlibdir=/lib --libdir=/usr/lib \
+    --with-zlib --with-xz</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/kmod.xml"

Modified: trunk/clfs/final-system/multilib/less.xml
===================================================================
--- trunk/clfs/final-system/multilib/less.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/less.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -56,10 +56,6 @@
     href="../common/less.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/less.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

Modified: trunk/clfs/final-system/multilib/mpc-64bit.xml
===================================================================
--- trunk/clfs/final-system/multilib/mpc-64bit.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/mpc-64bit.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -27,7 +27,8 @@
 
 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
-  ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
+  ./configure --prefix=/usr --libdir=/usr/lib64 \
+  --docdir=/usr/share/doc/mpc-&mpc-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/mpc.xml"
@@ -57,6 +58,18 @@
     href="../common/mpc.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/mpc.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/mpc.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/mpc.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

Modified: trunk/clfs/final-system/multilib/mpc-n32.xml
===================================================================
--- trunk/clfs/final-system/multilib/mpc-n32.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/mpc-n32.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -40,14 +40,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -58,6 +50,10 @@
     href="../common/mpc.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/mpc.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
   </sect2>
 
   <sect2 role="content">

Modified: trunk/clfs/final-system/multilib/mpc.xml
===================================================================
--- trunk/clfs/final-system/multilib/mpc.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/mpc.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -40,14 +40,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -58,6 +50,10 @@
     href="../common/mpc.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/mpc.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
   </sect2>
 
   <sect2 role="content">

Modified: trunk/clfs/final-system/multilib/mpfr-64bit.xml
===================================================================
--- trunk/clfs/final-system/multilib/mpfr-64bit.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/mpfr-64bit.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -34,8 +34,9 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
-LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
-  ./configure --prefix=/usr --libdir=/usr/lib64 --enable-shared</userinput></screen>
+    LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
+    ./configure --prefix=/usr --libdir=/usr/lib64 \
+    --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/mpfr.xml"
@@ -61,10 +62,6 @@
     href="../common/mpfr.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

Modified: trunk/clfs/final-system/multilib/mpfr-n32.xml
===================================================================
--- trunk/clfs/final-system/multilib/mpfr-n32.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/mpfr-n32.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -35,8 +35,9 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \
-LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
-  ./configure --prefix=/usr --libdir=/usr/lib32 --enable-shared</userinput></screen>
+    LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
+    ./configure --prefix=/usr --libdir=/usr/lib32 \
+    --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/mpfr.xml"
@@ -62,10 +63,6 @@
     href="../common/mpfr.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
   </sect2>
 
   <sect2 role="content">

Modified: trunk/clfs/final-system/multilib/mpfr.xml
===================================================================
--- trunk/clfs/final-system/multilib/mpfr.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/mpfr.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -35,8 +35,9 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \
-LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
-  ./configure --prefix=/usr --host=${CLFS_TARGET32} --enable-shared</userinput></screen>
+    LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
+    ./configure --prefix=/usr --host=${CLFS_TARGET32} \
+    --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/mpfr.xml"
@@ -62,10 +63,6 @@
     href="../common/mpfr.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
   </sect2>
 
   <sect2 role="content">

Modified: trunk/clfs/final-system/multilib/ncurses-64bit.xml
===================================================================
--- trunk/clfs/final-system/multilib/ncurses-64bit.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/ncurses-64bit.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -36,7 +36,7 @@
 <screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
    ./configure --prefix=/usr --libdir=/lib64 \
    --with-shared --without-debug --enable-widec \
-   --with-manpage-format=normal \
+   --with-manpage-format=normal --enable-pc-files \
    --with-default-terminfo-dir=/usr/share/terminfo</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -73,18 +73,18 @@
 
     <para os="j">Créez les liens symboliques dans <filename class="directory">/usr/lib64 :</filename></para>
 
-<screen os="k"><userinput>rm -v /lib64/lib{ncursesw,menuw,panelw,formw}.so
-ln -svf ../../lib64/libncursesw.so.5 /usr/lib64/libncursesw.so
-ln -svf ../../lib64/libmenuw.so.5 /usr/lib64/libmenuw.so
-ln -svf ../../lib64/libpanelw.so.5 /usr/lib64/libpanelw.so
-ln -svf ../../lib64/libformw.so.5 /usr/lib64/libformw.so</userinput></screen>
+<screen os="k"><userinput>ln -svf ../../lib64/$(readlink /lib64/libncursesw.so) /usr/lib64/libncursesw.so
+ln -svf ../../lib64/$(readlink /lib64/libmenuw.so) /usr/lib64/libmenuw.so
+ln -svf ../../lib64/$(readlink /lib64/libpanelw.so) /usr/lib64/libpanelw.so
+ln -svf ../../lib64/$(readlink /lib64/libformw.so) /usr/lib64/libformw.so
+rm -v /lib64/lib{ncursesw,menuw,panelw,formw}.so</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="ncurses.xml"
     xpointer="xpointer(//*[@os='l'])"/>
 
 <screen os="m"><userinput>for lib in curses ncurses form panel menu ; do
-        echo "INPUT(-l${lib}w)" > /usr/lib64/lib${lib}.so
+        echo "INPUT(-l${lib}w)" > /usr/lib64/lib${lib}.so
         ln -sfv lib${lib}w.a /usr/lib64/lib${lib}.a
 done
 ln -sfv libcurses.so /usr/lib64/libcursesw.so
@@ -95,11 +95,6 @@
 ln -sfv ncursesw5-config-64 /usr/bin/ncurses5-config-64
 ln -sfv ncursesw5-config /usr/bin/ncurses5-config</userinput></screen>
 
-    <para os="n">Puis nous créerons un lien symbolique vers /usr/share/terminfo dans 
-    <filename class="directory">/usr/lib64</filename> pour préserver la compatibilité :</para>
-
-<screen os="o"><userinput>ln -sfv ../share/terminfo /usr/lib64/terminfo</userinput></screen>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

Modified: trunk/clfs/final-system/multilib/ncurses-n32.xml
===================================================================
--- trunk/clfs/final-system/multilib/ncurses-n32.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/ncurses-n32.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -37,7 +37,7 @@
 <screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
    ./configure --prefix=/usr --libdir=/lib32 \
    --with-shared --without-debug --enable-widec \
-   --with-manpage-format=normal \
+   --with-manpage-format=normal --enable-pc-files \
    --with-default-terminfo-dir=/usr/share/terminfo</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -73,18 +73,18 @@
 
     <para os="j">Créez les liens symboliques dans <filename class="directory">/usr/lib32 :</filename></para>
 
-<screen os="k"><userinput>rm -v /lib32/lib{ncursesw,menuw,panelw,formw}.so
-ln -svf ../../lib32/libncursesw.so.5 /usr/lib32/libncursesw.so
-ln -svf ../../lib32/libmenuw.so.5 /usr/lib32/libmenuw.so
-ln -svf ../../lib32/libpanelw.so.5 /usr/lib32/libpanelw.so
-ln -svf ../../lib32/libformw.so.5 /usr/lib32/libformw.so</userinput></screen>
+<screen os="k"><userinput>ln -svf ../../lib32/$(readlink /lib32/libncursesw.so) /usr/lib32/libncursesw.so
+ln -svf ../../lib32/$(readlink /lib32/libmenuw.so) /usr/lib32/libmenuw.so
+ln -svf ../../lib32/$(readlink /lib32/libpanelw.so) /usr/lib32/libpanelw.so
+ln -svf ../../lib32/$(readlink /lib32/libformw.so) /usr/lib32/libformw.so
+rm -v /lib32/lib{ncursesw,menuw,panelw,formw}.so</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="ncurses.xml"
     xpointer="xpointer(//*[@os='l'])"/>
 
 <screen os="m"><userinput>for lib in curses ncurses form panel menu ; do
-        echo "INPUT(-l${lib}w)" > /usr/lib32/lib${lib}.so
+        echo "INPUT(-l${lib}w)" > /usr/lib32/lib${lib}.so
         ln -sfv lib${lib}w.a /usr/lib32/lib${lib}.a
 done
 ln -sfv libcurses.so /usr/lib32/libcursesw.so
@@ -94,11 +94,6 @@
 ln -sfv libncurses++w.a /usr/lib32/libncurses++.a
 ln -sfv ncurses5w-config-32 /usr/bin/ncurses5-config-32</userinput></screen>
 
-    <para os="n">Puis nous créerons un lien vers /usr/share/terminfo dans 
-    <filename class="directory">/usr/lib32</filename> pour préserver la compatibilité :</para>
-
-<screen os="o"><userinput>ln -sfv ../share/terminfo /usr/lib32/terminfo</userinput></screen>
-
   </sect2>
 
   <sect2 role="content">

Modified: trunk/clfs/final-system/multilib/ncurses.xml
===================================================================
--- trunk/clfs/final-system/multilib/ncurses.xml	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/final-system/multilib/ncurses.xml	2014-10-11 04:54:10 UTC (rev 6586)
@@ -37,11 +37,15 @@
 <screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
    ./configure --prefix=/usr --libdir=/lib \
    --with-shared --without-debug --enable-widec \
-   --with-manpage-format=normal \
+   --with-manpage-format=normal --enable-pc-files \
    --with-default-terminfo-dir=/usr/share/terminfo</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='b1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/ncurses.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -86,7 +90,7 @@
     xpointer="xpointer(//*[@os='l'])"/>
 
 <screen os="m"><userinput>for lib in curses ncurses form panel menu ; do
-        echo "INPUT(-l${lib}w)" > /usr/lib/lib${lib}.so
+        echo "INPUT(-l${lib}w)" > /usr/lib/lib${lib}.so
         ln -sfv lib${lib}w.a /usr/lib/lib${lib}.a
 done
 ln -sfv libcurses.so /usr/lib/libcursesw.so
@@ -96,14 +100,6 @@
 ln -sfv libncurses++w.a /usr/lib/libncurses++.a
 ln -sfv ncursesw5-config-32 /usr/bin/ncurses5-config-32</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
   </sect2>
 
   <sect2 role="content">

Modified: trunk/clfs/introduction/common/changelog.xml
===================================================================
(Binary files differ)

Modified: trunk/clfs/maj
===================================================================
--- trunk/clfs/maj	2014-10-10 11:28:16 UTC (rev 6585)
+++ trunk/clfs/maj	2014-10-11 04:54:10 UTC (rev 6586)
@@ -1,1339 +1,3 @@
-diff -ru /home/jp/a/BOOK/cross-tools/common/gcc-static.xml BOOK/cross-tools/common/gcc-static.xml
---- /home/jp/a/BOOK/cross-tools/common/gcc-static.xml	2014-05-11 16:24:52.642516678 +0200
-+++ BOOK/cross-tools/common/gcc-static.xml	2014-10-03 20:44:43.904339261 +0200
-@@ -123,7 +130,9 @@
-       <varlistentry>
-         <term><parameter>--with-newlib</parameter></term>
-         <listitem>
--          <para>Tells GCC that the target libc will use 'newlib'.</para>
-+          <para>This causes GCC to enable the <envar>inhibit_libc</envar> flag,
-+          which prevents <filename class="libraryfile">libgcc</filename>
-+          from building code that uses libc support.</para>
-         </listitem>
-       </varlistentry>
- 
-@@ -135,23 +144,10 @@
-       </varlistentry>
- 
-       <varlistentry>
--        <term><parameter>--disable-libgomp</parameter></term>
--        <listitem>
--          <para>Disables the creation of runtime libraries used by GOMP.</para>
--        </listitem>
--      </varlistentry>
--
--      <varlistentry>
--        <term><parameter>--disable-libmudflap</parameter></term>
-+        <term><parameter>--disable-lib*</parameter></term>
-         <listitem>
--          <para>Disables the creation of runtime libaries used by libmudflap.</para>
--        </listitem>
--      </varlistentry>
--
--      <varlistentry>
--        <term><parameter>--disable-libssp</parameter></term>
--        <listitem>
--          <para>Disables the use of Stack Smashing Protection for runtime libraries.</para>
-+          <para>These options prevent GCC from building a number of libraries
-+          that are not needed at this time.</para>
-         </listitem>
-       </varlistentry>
- 
-@@ -166,30 +162,18 @@
-       </varlistentry>
- 
-       <varlistentry>
--        <term><parameter>--disable-libatomic</parameter></term>
--        <listitem>
--          <para>The atomic library isn't needed at this time.</para>
--        </listitem>
--      </varlistentry>
--
--      <varlistentry>
--        <term><parameter>--disable-libitm</parameter></term>
--        <listitem>
--          <para>The itm library isn't neeeded at this tiem.</para>
--        </listitem>
--      </varlistentry>
--
--      <varlistentry>
--        <term><parameter>--disable-libsanitizer</parameter></term>
-+        <term><parameter>--disable-target-zlib</parameter></term>
-         <listitem>
--          <para>The sanitizer library isn't needed at this time.</para>
-+          <para>This tells GCC not to build the copy of Zlib in its
-+          source tree.</para>
-         </listitem>
-       </varlistentry>
- 
-       <varlistentry>
--        <term><parameter>--disable-libquadmath</parameter></term>
-+        <term><parameter>--with-system-zlib</parameter></term>
-         <listitem>
--          <para>The quadmath library isn't needed at this time.</para>
-+          <para>This tells GCC to link to the system-installed zlib instead
-+          of the one in its source tree.</para>
-         </listitem>
-       </varlistentry>
- 
-diff -ru /home/jp/a/BOOK/final-system/multilib/bzip2-64bit.xml BOOK/final-system/multilib/bzip2-64bit.xml
---- /home/jp/a/BOOK/final-system/multilib/bzip2-64bit.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/bzip2-64bit.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -29,6 +29,14 @@
-     href="bzip2.xml"
-     xpointer="xpointer(//*[@os='s2'])"/>
- 
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/bzip2.xml"
-+    xpointer="xpointer(//*[@os='s3'])"/>
-+
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/bzip2.xml"
-+    xpointer="xpointer(//*[@os='s4'])"/>
-+
-     <para os="m1">We need to change the default lib path
-     to <filename class="directory">lib64</filename>:</para>
- 
-diff -ru /home/jp/a/BOOK/final-system/multilib/bzip2-n32.xml BOOK/final-system/multilib/bzip2-n32.xml
---- /home/jp/a/BOOK/final-system/multilib/bzip2-n32.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/bzip2-n32.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -30,6 +30,14 @@
-     href="bzip2.xml"
-     xpointer="xpointer(//*[@os='s2'])"/>
- 
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/bzip2.xml"
-+    xpointer="xpointer(//*[@os='s3'])"/>
-+
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/bzip2.xml"
-+    xpointer="xpointer(//*[@os='s4'])"/>
-+
-     <para os="m1">We need to change the default lib path
-     to <filename class="directory">lib32</filename>:</para>
- 
-diff -ru /home/jp/a/BOOK/final-system/multilib/bzip2.xml BOOK/final-system/multilib/bzip2.xml
---- /home/jp/a/BOOK/final-system/multilib/bzip2.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/bzip2.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -32,6 +32,14 @@
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/bzip2.xml"
-+    xpointer="xpointer(//*[@os='s3'])"/>
-+
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/bzip2.xml"
-+    xpointer="xpointer(//*[@os='s4'])"/>
-+
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/bzip2.xml"
-     xpointer="xpointer(//*[@os='a'])"/>
- 
- <screen os="b"><userinput>make -f Makefile-libbz2_so CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}"
-diff -ru /home/jp/a/BOOK/final-system/multilib/cloog-64bit.xml BOOK/final-system/multilib/cloog-64bit.xml
---- /home/jp/a/BOOK/final-system/multilib/cloog-64bit.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/cloog-64bit.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -27,8 +27,7 @@
- 
- <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
- LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
--  ./configure --prefix=/usr \
--    --libdir=/usr/lib64 --enable-shared --with-isl=system</userinput></screen>
-+  ./configure --prefix=/usr --libdir=/usr/lib64 --with-isl=system</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/cloog.xml"
-@@ -62,10 +61,6 @@
-     href="../common/cloog.xml"
-     xpointer="xpointer(//*[@os='h'])"/>
- 
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/cloog.xml"
--    xpointer="xpointer(//*[@os='i'])"/>
--
-   </sect2>
- 
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-diff -ru /home/jp/a/BOOK/final-system/multilib/cloog-n32.xml BOOK/final-system/multilib/cloog-n32.xml
---- /home/jp/a/BOOK/final-system/multilib/cloog-n32.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/cloog-n32.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -28,8 +28,7 @@
- 
- <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \
- LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
--  ./configure --prefix=/usr \
--    --libdir=/usr/lib32 --enable-shared --with-isl=system</userinput></screen>
-+  ./configure --prefix=/usr --libdir=/usr/lib32 --with-isl=system</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/cloog.xml"
-@@ -63,10 +62,6 @@
-     href="../common/cloog.xml"
-     xpointer="xpointer(//*[@os='h'])"/>
- 
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/cloog.xml"
--    xpointer="xpointer(//*[@os='i'])"/>
--
-   </sect2>
- 
-   <sect2 role="content">
-diff -ru /home/jp/a/BOOK/final-system/multilib/cloog.xml BOOK/final-system/multilib/cloog.xml
---- /home/jp/a/BOOK/final-system/multilib/cloog.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/cloog.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -28,8 +28,7 @@
- 
- <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \
- LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
--  ./configure --prefix=/usr \
--    --host=${CLFS_TARGET32} --enable-shared --with-isl=system</userinput></screen>
-+  ./configure --prefix=/usr --host=${CLFS_TARGET32} --with-isl=system</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/cloog.xml"
-@@ -63,10 +62,6 @@
-     href="../common/cloog.xml"
-     xpointer="xpointer(//*[@os='h'])"/>
- 
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/cloog.xml"
--    xpointer="xpointer(//*[@os='i'])"/>
--
-   </sect2>
- 
-   <sect2 role="content">
-diff -ru /home/jp/a/BOOK/final-system/multilib/coreutils.xml BOOK/final-system/multilib/coreutils.xml
---- /home/jp/a/BOOK/final-system/multilib/coreutils.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/coreutils.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -37,7 +37,7 @@
-    ./configure --prefix=/usr \
-     --enable-no-install-program=kill,uptime \
-     --enable-install-program=hostname</userinput></screen>
--    
-+
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/coreutils.xml"
-     xpointer="xpointer(//*[@os='d1'])"/>
-@@ -106,10 +106,6 @@
-     href="../common/coreutils.xml"
-     xpointer="xpointer(//*[@os='t'])"/>
- 
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/coreutils.xml"
--    xpointer="xpointer(//*[@os='u'])"/>
--
-   </sect2>
- 
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-diff -ru /home/jp/a/BOOK/final-system/multilib/diffutils.xml BOOK/final-system/multilib/diffutils.xml
---- /home/jp/a/BOOK/final-system/multilib/diffutils.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/diffutils.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -23,17 +23,25 @@
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/diffutils.xml"
-+    xpointer="xpointer(//*[@os='s1'])"/>
-+
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/diffutils.xml"
-+    xpointer="xpointer(//*[@os='s2'])"/>
-+
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/diffutils.xml"
-     xpointer="xpointer(//*[@os='a'])"/>
- 
- <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/diffutils.xml"
--    xpointer="xpointer(//*[@os='s1'])"/>
-+    xpointer="xpointer(//*[@os='s3'])"/>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/diffutils.xml"
--    xpointer="xpointer(//*[@os='s2'])"/>
-+    xpointer="xpointer(//*[@os='s4'])"/>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/diffutils.xml"
-diff -ru /home/jp/a/BOOK/final-system/multilib/e2fsprogs-64bit.xml BOOK/final-system/multilib/e2fsprogs-64bit.xml
---- /home/jp/a/BOOK/final-system/multilib/e2fsprogs-64bit.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/e2fsprogs-64bit.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -38,8 +38,9 @@
-     href="e2fsprogs.xml"
-     xpointer="xpointer(//*[@os='c'])"/>
- 
--<screen os="d"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
--  ../configure --prefix=/usr --with-root-prefix="" \
-+<screen os="d"><userinput>PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
-+CC="gcc ${BUILD64}"  \
-+../configure --prefix=/usr --with-root-prefix="" \
-     --enable-elf-shlibs --disable-libblkid \
-     --disable-libuuid --disable-fsck \
-     --disable-uuidd</userinput></screen>
-diff -ru /home/jp/a/BOOK/final-system/multilib/e2fsprogs-n32.xml BOOK/final-system/multilib/e2fsprogs-n32.xml
---- /home/jp/a/BOOK/final-system/multilib/e2fsprogs-n32.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/e2fsprogs-n32.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -39,8 +39,9 @@
-     href="e2fsprogs.xml"
-     xpointer="xpointer(//*[@os='c'])"/>
- 
--<screen os="d"><userinput>CC="gcc ${BUILDN32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATHN32}" \
--  ../configure --prefix=/usr --with-root-prefix="" \
-+<screen os="d"><userinput>PKG_CONFIG_PATH="${PKG_CONFIG_PATHN32}" \
-+CC="gcc ${BUILDN32}" \
-+../configure --prefix=/usr --with-root-prefix="" \
-     --enable-elf-shlibs --disable-libblkid \
-     --disable-libuuid --disable-fsck \
-     --disable-uuidd</userinput></screen>
-diff -ru /home/jp/a/BOOK/cross-tools/common/gmp.xml BOOK/cross-tools/common/gmp.xml
---- /home/jp/a/BOOK/cross-tools/common/gmp.xml	2014-05-11 16:24:52.642516678 +0200
-+++ BOOK/cross-tools/common/gmp.xml	2014-10-03 20:44:43.904339261 +0200
-@@ -12,7 +12,7 @@
- 
-   <indexterm zone="ch-cross-tools-gmp">
-     <primary sortas="a-GMP">GMP</primary>
--    <secondary>cross-tools</secondary>
-+    <secondary>cross tools</secondary>
-   </indexterm>
- 
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-@@ -32,6 +32,10 @@
-     xpointer="xpointer(//*[@os='p2'])"/>
- -->
- 
-+    <para>This package and the next two - MPFR and MPC - will be installed
-+    into <filename class="directory">/cross-tools</filename> because GCC
-+    requires them to build.</para>
-+
-     <note os="n1">
-       <para>If you are building with a host which has 32-bit user-space with a
-       64-bit capable CPU, cross-tools GMP will attempt to link with 64-bit
-@@ -42,10 +46,10 @@
-     <para os="a">Prepare GMP for compilation:</para>
- 
- <screen os="b"><userinput>./configure --prefix=/cross-tools --enable-cxx \
--  --disable-static</userinput></screen>
-+    --disable-static</userinput></screen>
- 
-     <variablelist os="b1">
--      <title>The meaning of the new configure options:</title>
-+      <title>The meaning of the new configure option:</title>
- 
-       <varlistentry>
-         <term><parameter>--enable-cxx</parameter></term>
-diff -ru /home/jp/a/BOOK/final-system/multilib/e2fsprogs.xml BOOK/final-system/multilib/e2fsprogs.xml
---- /home/jp/a/BOOK/final-system/multilib/e2fsprogs.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/e2fsprogs.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -34,8 +34,9 @@
-     href="../common/e2fsprogs.xml"
-     xpointer="xpointer(//*[@os='c'])"/>
- 
--<screen os="d"><userinput>CC="gcc ${BUILD32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH32}" \
--  ../configure --prefix=/usr --with-root-prefix="" \
-+<screen os="d"><userinput>PKG_CONFIG_PATH="${PKG_CONFIG_PATH32}" \
-+CC="gcc ${BUILD32}" \
-+../configure --prefix=/usr --with-root-prefix="" \
-     --enable-elf-shlibs --disable-libblkid \
-     --disable-libuuid --disable-fsck \
-     --disable-uuidd</userinput></screen>
-diff -ru /home/jp/a/BOOK/final-system/multilib/findutils.xml BOOK/final-system/multilib/findutils.xml
---- /home/jp/a/BOOK/final-system/multilib/findutils.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/findutils.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -66,22 +66,6 @@
-     href="../common/findutils.xml"
-     xpointer="xpointer(//*[@os='h'])"/>
- 
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/findutils.xml"
--    xpointer="xpointer(//*[@os='i'])"/>
--
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/findutils.xml"
--    xpointer="xpointer(//*[@os='j'])"/>
--
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/findutils.xml"
--    xpointer="xpointer(//*[@os='k'])"/>
--
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/findutils.xml"
--    xpointer="xpointer(//*[@os='l'])"/>
--
-   </sect2>
- 
-   <sect2 id="contents-findutils" role="content">
-diff -ru /home/jp/a/BOOK/final-system/multilib/flex-64bit.xml BOOK/final-system/multilib/flex-64bit.xml
---- /home/jp/a/BOOK/final-system/multilib/flex-64bit.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/flex-64bit.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -26,7 +26,7 @@
-     xpointer="xpointer(//*[@os='a'])"/>
- 
- <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
--    --libdir=/usr/lib64</userinput></screen>
-+    --libdir=/usr/lib64 --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="flex.xml"
-@@ -45,6 +45,10 @@
-     xpointer="xpointer(//*[@os='e2'])"/>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/flex.xml"
-+    xpointer="xpointer(//*[@os='e3'])"/>
-+
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="flex.xml"
-     xpointer="xpointer(//*[@os='f'])"/>
- 
-@@ -52,20 +56,13 @@
-     href="../common/flex.xml"
-     xpointer="xpointer(//*[@os='g'])"/>
- 
--    <para os="h">There are some packages that expect to find the
--    <filename class="libraryfile">lex</filename> library in <filename
--    class="directory">/usr/lib64</filename>. Create a symlink to account for
--    this:</para>
--
--<screen os="i"><userinput>ln -sv libfl.a /usr/lib64/libl.a</userinput></screen>
--
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/flex.xml"
--    xpointer="xpointer(//*[@os='j'])"/>
-+    xpointer="xpointer(//*[@os='h'])"/>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/flex.xml"
--    xpointer="xpointer(//*[@os='k'])"/>
-+    xpointer="xpointer(//*[@os='i'])"/>
- 
-   </sect2>
- 
-diff -ru /home/jp/a/BOOK/final-system/multilib/flex-n32.xml BOOK/final-system/multilib/flex-n32.xml
---- /home/jp/a/BOOK/final-system/multilib/flex-n32.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/flex-n32.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -26,7 +26,7 @@
-     xpointer="xpointer(//*[@os='a'])"/>
- 
- <screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
--   --libdir=/usr/lib32</userinput></screen>
-+   --libdir=/usr/lib32 --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="flex.xml"
-@@ -44,13 +44,6 @@
-     href="flex.xml"
-     xpointer="xpointer(//*[@os='g'])"/>
- 
--    <para os="h">There are some packages that expect to find the
--    <filename class="libraryfile">lex</filename> library in <filename
--    class="directory">/usr/lib32</filename>. Create a symlink to account for
--    this:</para>
--
--<screen os="i"><userinput>ln -sv libfl.a /usr/lib32/libl.a</userinput></screen>
--
-   </sect2>
- 
-   <sect2 role="content">
-diff -ru /home/jp/a/BOOK/final-system/multilib/flex.xml BOOK/final-system/multilib/flex.xml
---- /home/jp/a/BOOK/final-system/multilib/flex.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/flex.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -26,27 +26,20 @@
-     href="../common/flex.xml"
-     xpointer="xpointer(//*[@os='a'])"/>
- 
--<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
-+<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr \
-+    --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/flex.xml"
-     xpointer="xpointer(//*[@os='c'])"/>
- 
--<screen os="d"><userinput>make libfl.a libfl_pic.a</userinput></screen>
-+<screen os="d"><userinput>make</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/flex.xml"
-     xpointer="xpointer(//*[@os='f'])"/>
- 
--<screen os="g"><userinput>make install-libLIBRARIES</userinput></screen>
--
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/flex.xml"
--    xpointer="xpointer(//*[@os='h'])"/>
--
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/flex.xml"
--    xpointer="xpointer(//*[@os='i'])"/>
-+<screen os="g"><userinput>make install</userinput></screen>
- 
-   </sect2>
- 
-diff -ru /home/jp/a/BOOK/final-system/multilib/gawk.xml BOOK/final-system/multilib/gawk.xml
---- /home/jp/a/BOOK/final-system/multilib/gawk.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/gawk.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -52,6 +52,14 @@
-     href="../common/gawk.xml"
-     xpointer="xpointer(//*[@os='g'])"/>
- 
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/gawk.xml"
-+    xpointer="xpointer(//*[@os='h'])"/>
-+
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/gawk.xml"
-+    xpointer="xpointer(//*[@os='i'])"/>
-+
-   </sect2>
- 
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-diff -ru /home/jp/a/BOOK/final-system/multilib/gcc.xml BOOK/final-system/multilib/gcc.xml
---- /home/jp/a/BOOK/final-system/multilib/gcc.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/gcc.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -39,14 +39,6 @@
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/gcc.xml"
--    xpointer="xpointer(//*[@os='d'])"/>
--
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/gcc.xml"
--    xpointer="xpointer(//*[@os='e'])"/>
--
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/gcc.xml"
-     xpointer="xpointer(//*[@os='f'])"/>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-@@ -57,16 +49,17 @@
-     href="../common/gcc.xml"
-     xpointer="xpointer(//*[@os='h'])"/>
- 
--<screen os="i"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
-+<screen os="i"><userinput>SED=sed CC="gcc -isystem /usr/include ${BUILD64}" \
- CXX="g++ -isystem /usr/include ${BUILD64}" \
- LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64:/usr/lib:/lib" \
-   ../gcc-&gcc-version;/configure --prefix=/usr --libdir=/usr/lib64 \
--    --libexecdir=/usr/lib64 --enable-shared --enable-threads=posix \
--    --enable-__cxa_atexit --enable-c99 --enable-long-long \
-+    --libexecdir=/usr/lib64 --enable-threads=posix --enable-__cxa_atexit \ 
-     --enable-clocale=gnu --enable-languages=c,c++ --disable-libstdcxx-pch \
--    --enable-cloog-backend=isl --disable-isl-version-check --with-system-zlib \
--    --enable-checking=release --enable-libstdcxx-time \
--    --disable-install-libiberty</userinput></screen>
-+    --with-system-zlib --enable-checking=release --enable-libstdcxx-time</userinput></screen>
-+
-+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/gcc.xml"
-+    xpointer="xpointer(//*[@os='i1'])"/>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/gcc.xml"
-@@ -139,8 +132,8 @@
-     <para os="y">Finally, move some misplaced files:</para>
- 
- 
--<screen os="z"><userinput>mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib
--mv -v /usr/lib64/*gdb.py /usr/share/gdb/auto-load/usr/lib64</userinput></screen>
-+<screen os="z"><userinput>mv -v /usr/lib/libstdc++*gdb.py /usr/share/gdb/auto-load/usr/lib
-+mv -v /usr/lib64/libstdc++*gdb.py /usr/share/gdb/auto-load/usr/lib64</userinput></screen>
- 
-   </sect2>
- 
-diff -ru /home/jp/a/BOOK/final-system/multilib/gettext-64bit.xml BOOK/final-system/multilib/gettext-64bit.xml
---- /home/jp/a/BOOK/final-system/multilib/gettext-64bit.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/gettext-64bit.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -26,7 +26,8 @@
-     xpointer="xpointer(//*[@os='a'])"/>
- 
- <screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
--   ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
-+   ./configure --prefix=/usr --libdir=/usr/lib64 \
-+   --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
- 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/gettext.xml"
-diff -ru /home/jp/a/BOOK/final-system/multilib/gettext-n32.xml BOOK/final-system/multilib/gettext-n32.xml
---- /home/jp/a/BOOK/final-system/multilib/gettext-n32.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/gettext-n32.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -27,7 +27,8 @@
-     xpointer="xpointer(//*[@os='a'])"/>
- 
- <screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
--   ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
-+   ./configure --prefix=/usr --libdir=/usr/lib32 \
-+   --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
- 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/gettext.xml"
-diff -ru /home/jp/a/BOOK/final-system/multilib/gettext.xml BOOK/final-system/multilib/gettext.xml
---- /home/jp/a/BOOK/final-system/multilib/gettext.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/gettext.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -27,7 +27,8 @@
-     xpointer="xpointer(//*[@os='a'])"/>
- 
- <screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
--   ./configure --prefix=/usr</userinput></screen>
-+   ./configure --prefix=/usr \
-+   --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/gettext.xml"
-diff -ru /home/jp/a/BOOK/cross-tools/common/isl.xml BOOK/cross-tools/common/isl.xml
---- /home/jp/a/BOOK/cross-tools/common/isl.xml	2014-05-11 16:24:52.642516678 +0200
-+++ BOOK/cross-tools/common/isl.xml	2014-10-03 20:44:43.904339261 +0200
-@@ -12,7 +12,7 @@
- 
-   <indexterm zone="ch-cross-tools-isl">
-     <primary sortas="a-ISL">ISL</primary>
--    <secondary>cross-tools</secondary>
-+    <secondary>cross tools</secondary>
-   </indexterm>
- 
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-@@ -22,6 +22,10 @@
-   <sect2 role="installation">
-     <title>Installation of ISL</title>
- 
-+    <para>We will install ISL and CLooG to enable extra functionality for GCC.
-+    They are not strictly required, but GCC can link to them to enable its
-+    new loop generation feature called Graphite.</para>
-+
-     <para os="a">Prepare ISL for compilation:</para>
- 
- <screen os="b"><userinput>LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-diff -ru /home/jp/a/BOOK/final-system/multilib/gmp-64bit.xml BOOK/final-system/multilib/gmp-64bit.xml
---- /home/jp/a/BOOK/final-system/multilib/gmp-64bit.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/gmp-64bit.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -43,7 +43,8 @@
- CXX="g++ -isystem /usr/include ${BUILD64}" \
- LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
-   ./configure --prefix=/usr \
--    --libdir=/usr/lib64 --enable-cxx</userinput></screen>
-+    --libdir=/usr/lib64 --enable-cxx \
-+    --docdir=/usr/share/doc/gmp-&gmp-version;</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/gmp.xml"
-@@ -73,13 +74,25 @@
-     href="../common/gmp.xml"
-     xpointer="xpointer(//*[@os='i'])"/>
- 
--    <para os="j">Create the 64bit header file:</para>
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/gmp.xml"
-+    xpointer="xpointer(//*[@os='j'])"/>
-+
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/gmp.xml"
-+    xpointer="xpointer(//*[@os='k'])"/>
-+
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/gmp.xml"
-+    xpointer="xpointer(//*[@os='l'])"/>
-+
-+    <para os="m">Create the 64bit header file:</para>
- 
--<screen os="k"><userinput>mv -v /usr/include/gmp{,-64}.h</userinput></screen>
-+<screen os="n"><userinput>mv -v /usr/include/gmp{,-64}.h</userinput></screen>
- 
--    <para os="l">Finally, create a stub header in the place of the originals:</para>
-+    <para os="o">Finally, create a stub header in the place of the originals:</para>
- 
--<screen os="m"><userinput>cat > /usr/include/gmp.h << "EOF"
-+<screen os="p"><userinput>cat > /usr/include/gmp.h << "EOF"
- /* gmp.h - Stub Header  */
- #ifndef __STUB__GMP_H__
- #define __STUB__GMP_H__
-diff -ru /home/jp/a/BOOK/final-system/multilib/gmp-n32.xml BOOK/final-system/multilib/gmp-n32.xml
---- /home/jp/a/BOOK/final-system/multilib/gmp-n32.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/gmp-n32.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -57,14 +57,6 @@
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/gmp.xml"
--    xpointer="xpointer(//*[@os='e'])"/>
--
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/gmp.xml"
--    xpointer="xpointer(//*[@os='f'])"/>
--
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/gmp.xml"
-     xpointer="xpointer(//*[@os='g'])"/>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-@@ -75,9 +67,13 @@
-     href="../common/gmp.xml"
-     xpointer="xpointer(//*[@os='i'])"/>
- 
--    <para os="j">Create the N32 header file:</para>
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/gmp.xml"
-+    xpointer="xpointer(//*[@os='j'])"/>
-+
-+    <para os="k">Create the N32 header file:</para>
- 
--<screen os="k"><userinput>mv -v /usr/include/gmp{,-n32}.h</userinput></screen>
-+<screen os="l"><userinput>mv -v /usr/include/gmp{,-n32}.h</userinput></screen>
- 
-   </sect2>
- 
-diff -ru /home/jp/a/BOOK/final-system/multilib/gmp.xml BOOK/final-system/multilib/gmp.xml
---- /home/jp/a/BOOK/final-system/multilib/gmp.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/gmp.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -55,14 +55,6 @@
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/gmp.xml"
--    xpointer="xpointer(//*[@os='e'])"/>
--
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/gmp.xml"
--    xpointer="xpointer(//*[@os='f'])"/>
--
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/gmp.xml"
-     xpointer="xpointer(//*[@os='g'])"/>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-@@ -73,9 +65,13 @@
-     href="../common/gmp.xml"
-     xpointer="xpointer(//*[@os='i'])"/>
- 
--    <para os="j">The header installed by GMP is architecture specific. Programs compiled as 32bit will require the header provided by the 32bit installation of GMP. The same applies for 64bit programs. Move the header so a wrapper can be put in its place later:</para>
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/gmp.xml"
-+    xpointer="xpointer(//*[@os='j'])"/>
-+
-+    <para os="k">The header installed by GMP is architecture specific. Programs compiled as 32bit will require the header provided by the 32bit installation of GMP. The same applies for 64bit programs. Move the header so a wrapper can be put in its place later:</para>
- 
--<screen os="k"><userinput>mv -v /usr/include/gmp{,-32}.h</userinput></screen>
-+<screen os="l"><userinput>mv -v /usr/include/gmp{,-32}.h</userinput></screen>
- 
-   </sect2>
- 
-diff -ru /home/jp/a/BOOK/final-system/multilib/groff.xml BOOK/final-system/multilib/groff.xml
---- /home/jp/a/BOOK/final-system/multilib/groff.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/groff.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -53,14 +53,6 @@
-     href="../common/groff.xml"
-     xpointer="xpointer(//*[@os='h'])"/>
- 
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/groff.xml"
--    xpointer="xpointer(//*[@os='i'])"/>
--
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/groff.xml"
--    xpointer="xpointer(//*[@os='j'])"/>
--
-   </sect2>
- 
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-diff -ru /home/jp/a/BOOK/final-system/multilib/gzip.xml BOOK/final-system/multilib/gzip.xml
---- /home/jp/a/BOOK/final-system/multilib/gzip.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/gzip.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -39,9 +39,7 @@
-     href="../common/gzip.xml"
-     xpointer="xpointer(//*[@os='e'])"/>
- 
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/gzip.xml"
--    xpointer="xpointer(//*[@os='e2'])"/>
-+<screen><userinput remap="test">make PERL=perl-64 check</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/gzip.xml"
-diff -ru /home/jp/a/BOOK/final-system/multilib/iproute2.xml BOOK/final-system/multilib/iproute2.xml
---- /home/jp/a/BOOK/final-system/multilib/iproute2.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/iproute2.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -28,14 +28,6 @@
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/iproute2.xml"
-     xpointer="xpointer(//*[@os='s2'])"/>
--    
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/iproute2.xml"
--    xpointer="xpointer(//*[@os='f1'])"/>
--    
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/iproute2.xml"
--    xpointer="xpointer(//*[@os='f2'])"/>
- 
-     <para os="p1">This patch adds the ability to update the LIBDIR path:</para>
- 
-@@ -45,8 +37,7 @@
-     href="../common/iproute2.xml"
-     xpointer="xpointer(//*[@os='a'])"/>
- 
--<screen os="b"><userinput>make CC="gcc ${BUILD64}" DESTDIR= LIBDIR=/usr/lib64 \
--    DOCDIR=/usr/share/doc/iproute2 MANDIR=/usr/share/man</userinput></screen>
-+<screen os="b"><userinput>make CC="gcc ${BUILD64}" LIBDIR=/usr/lib64</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/iproute2.xml"
-@@ -56,13 +47,8 @@
-     href="../common/iproute2.xml"
-     xpointer="xpointer(//*[@os='d'])"/>
- 
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/iproute2.xml"
--    xpointer="xpointer(//*[@os='e'])"/>
--
--<screen os="f"><userinput>make DESTDIR= LIBDIR=/usr/lib64 \
--    DOCDIR=/usr/share/doc/iproute2 \
--    MANDIR=/usr/share/man install</userinput></screen>
-+<screen os="e"><userinput>make LIBDIR=/usr/lib64 \
-+    DOCDIR=/usr/share/doc/iproute2-&iproute2-version; install</userinput></screen>
- 
-   </sect2>
- 
-diff -ru /home/jp/a/BOOK/final-system/multilib/iputils.xml BOOK/final-system/multilib/iputils.xml
---- /home/jp/a/BOOK/final-system/multilib/iputils.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/iputils.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -33,7 +33,7 @@
-     href="../common/iputils.xml"
-     xpointer="xpointer(//*[@os='a'])"/>
- 
--<screen os="b"><userinput>make USE_CAP=no CC="gcc ${BUILD64}" \
-+<screen os="b"><userinput>make CC="gcc ${BUILD64}" \
-     IPV4_TARGETS="tracepath ping clockdiff rdisc" \
-     IPV6_TARGETS="tracepath6 traceroute6"</userinput></screen>
- 
-diff -ru /home/jp/a/BOOK/final-system/multilib/isl-64bit.xml BOOK/final-system/multilib/isl-64bit.xml
---- /home/jp/a/BOOK/final-system/multilib/isl-64bit.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/isl-64bit.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -57,11 +57,7 @@
-     href="../common/isl.xml"
-     xpointer="xpointer(//*[@os='i'])"/>
- 
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/isl.xml"
--    xpointer="xpointer(//*[@os='j'])"/>
--
--<screen os="k"><userinput>mkdir -pv /usr/share/gdb/auto-load/usr/lib64
-+<screen os="j"><userinput>mkdir -pv /usr/share/gdb/auto-load/usr/lib64
- mv -v /usr/lib64/*gdb.py /usr/share/gdb/auto-load/usr/lib64</userinput></screen>
-   </sect2>
- 
-diff -ru /home/jp/a/BOOK/final-system/multilib/isl-n32.xml BOOK/final-system/multilib/isl-n32.xml
---- /home/jp/a/BOOK/final-system/multilib/isl-n32.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/isl-n32.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -58,11 +58,7 @@
-     href="../common/isl.xml"
-     xpointer="xpointer(//*[@os='i'])"/>
- 
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/isl.xml"
--    xpointer="xpointer(//*[@os='j'])"/>
--
--<screen os="k"><userinput>mkdir -pv /usr/share/gdb/auto-load/usr/lib32
-+<screen os="j"><userinput>mkdir -pv /usr/share/gdb/auto-load/usr/lib32
- mv -v /usr/lib32/*gdb.py /usr/share/gdb/auto-load/usr/lib32</userinput></screen>
-   </sect2>
- 
-diff -ru /home/jp/a/BOOK/final-system/multilib/isl.xml BOOK/final-system/multilib/isl.xml
---- /home/jp/a/BOOK/final-system/multilib/isl.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/isl.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -62,10 +62,6 @@
-     href="../common/isl.xml"
-     xpointer="xpointer(//*[@os='j'])"/>
- 
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/isl.xml"
--    xpointer="xpointer(//*[@os='k'])"/>
--
-   </sect2>
- 
-   <sect2 role="content">
-diff -ru /home/jp/a/BOOK/cross-tools/common/m4.xml BOOK/cross-tools/common/m4.xml
---- /home/jp/a/BOOK/cross-tools/common/m4.xml	2014-05-11 16:24:52.642516678 +0200
-+++ BOOK/cross-tools/common/m4.xml	2014-10-03 20:44:43.904339261 +0200
-@@ -12,7 +12,7 @@
- 
-   <indexterm zone="ch-cross-tools-m4">
-     <primary sortas="a-M4">M4</primary>
--    <secondary>temporary system</secondary>
-+    <secondary>cross tools</secondary>
-   </indexterm>
- 
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-@@ -22,6 +22,12 @@
-   <sect2 role="installation">
-     <title>Installation of M4</title>
- 
-+    <para>M4 is required to build GMP. We will compile and install an
-+    <command>m4</command> program into
-+    <filename class="directory">/cross-tools</filename>, so that we have a
-+    known-good version which can be used to build GMP, both in
-+    Cross-Tools and the Temporary System.</para>
-+
-     <para os="a">Prepare M4 for compilation:</para>
- 
- <screen os="b"><userinput>./configure --prefix=/cross-tools</userinput></screen>
-diff -ru /home/jp/a/BOOK/final-system/multilib/kbd.xml BOOK/final-system/multilib/kbd.xml
---- /home/jp/a/BOOK/final-system/multilib/kbd.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/kbd.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -32,7 +32,9 @@
-     href="../common/kbd.xml"
-     xpointer="xpointer(//*[@os='c'])"/>
- 
--<screen os="d"><userinput>make</userinput></screen>
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/kbd.xml"
-+    xpointer="xpointer(//*[@os='d'])"/>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/kbd.xml"
-@@ -54,6 +56,22 @@
-     href="../common/kbd.xml"
-     xpointer="xpointer(//*[@os='i'])"/>
- 
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/kbd.xml"
-+    xpointer="xpointer(//*[@os='j'])"/>
-+
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/kbd.xml"
-+    xpointer="xpointer(//*[@os='k'])"/>
-+
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/kbd.xml"
-+    xpointer="xpointer(//*[@os='l'])"/>
-+
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/kbd.xml"
-+    xpointer="xpointer(//*[@os='m'])"/>
-+
-   </sect2>
- 
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-diff -ru /home/jp/a/BOOK/final-system/multilib/kmod-64bit.xml BOOK/final-system/multilib/kmod-64bit.xml
---- /home/jp/a/BOOK/final-system/multilib/kmod-64bit.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/kmod-64bit.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -26,10 +26,10 @@
-     xpointer="xpointer(//*[@os='a'])"/>
- 
- <screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATH64} CC="gcc ${BUILD64}" \
--        ./configure --prefix=/usr \
--        --bindir=/bin --sysconfdir=/etc \
--        --with-rootlibdir=/lib64 --libdir=/usr/lib64 \
--        --with-zlib --with-xz --disable-manpages</userinput></screen>
-+  ./configure --prefix=/usr \
-+    --bindir=/bin --sysconfdir=/etc \
-+    --with-rootlibdir=/lib64 --libdir=/usr/lib64 \
-+    --with-zlib --with-xz</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/kmod.xml"
-@@ -58,11 +58,11 @@
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/kmod.xml"
-     xpointer="xpointer(//*[@os='h'])"/>
--    
-+
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/kmod.xml"
-     xpointer="xpointer(//*[@os='i'])"/>
--    
-+
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/kmod.xml"
-     xpointer="xpointer(//*[@os='j'])"/>
-diff -ru /home/jp/a/BOOK/final-system/multilib/kmod-n32.xml BOOK/final-system/multilib/kmod-n32.xml
---- /home/jp/a/BOOK/final-system/multilib/kmod-n32.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/kmod-n32.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -26,11 +26,11 @@
-     href="../common/kmod.xml"
-     xpointer="xpointer(//*[@os='a'])"/>
- 
--    <screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATH32} CC="gcc ${BUILD32}" \
--            ./configure --prefix=/usr \
--            --bindir=/bin --sysconfdir=/etc \
--            --with-rootlibdir=/lib32 --libdir=/usr/lib32 \
--            --with-zlib --with-xz --disable-manpages</userinput></screen>
-+<screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATH32} CC="gcc ${BUILD32}" \
-+  ./configure --prefix=/usr \
-+    --bindir=/bin --sysconfdir=/etc \
-+    --with-rootlibdir=/lib32 --libdir=/usr/lib32 \
-+    --with-zlib --with-xz</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/kmod.xml"
-@@ -59,7 +59,7 @@
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/kmod.xml"
-     xpointer="xpointer(//*[@os='h'])"/>
--    
-+
-   </sect2>
- 
-   <sect2 role="content">
-diff -ru /home/jp/a/BOOK/final-system/multilib/kmod.xml BOOK/final-system/multilib/kmod.xml
---- /home/jp/a/BOOK/final-system/multilib/kmod.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/kmod.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -27,10 +27,10 @@
-     xpointer="xpointer(//*[@os='a'])"/>
- 
- <screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATH32} CC="gcc ${BUILD32}" \
--        ./configure --prefix=/usr \
--        --bindir=/bin --sysconfdir=/etc \
--        --with-rootlibdir=/lib --libdir=/usr/lib \
--        --with-zlib --with-xz --disable-manpages</userinput></screen>
-+  ./configure --prefix=/usr \
-+    --bindir=/bin --sysconfdir=/etc \
-+    --with-rootlibdir=/lib --libdir=/usr/lib \
-+    --with-zlib --with-xz</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/kmod.xml"
-@@ -61,7 +61,7 @@
-     xpointer="xpointer(//*[@os='h'])"/>
- 
-   </sect2>
--  
-+
-   <sect2 role="content">
-     <title/>
- 
-diff -ru /home/jp/a/BOOK/final-system/multilib/less.xml BOOK/final-system/multilib/less.xml
---- /home/jp/a/BOOK/final-system/multilib/less.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/less.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -56,10 +56,6 @@
-     href="../common/less.xml"
-     xpointer="xpointer(//*[@os='i'])"/>
- 
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/less.xml"
--    xpointer="xpointer(//*[@os='j'])"/>
--
-   </sect2>
- 
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-diff -ru /home/jp/a/BOOK/final-system/multilib/mpc-64bit.xml BOOK/final-system/multilib/mpc-64bit.xml
---- /home/jp/a/BOOK/final-system/multilib/mpc-64bit.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/mpc-64bit.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -27,7 +27,8 @@
- 
- <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
- LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
--  ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
-+  ./configure --prefix=/usr --libdir=/usr/lib64 \
-+  --docdir=/usr/share/doc/mpc-&mpc-version;</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/mpc.xml"
-@@ -57,6 +58,18 @@
-     href="../common/mpc.xml"
-     xpointer="xpointer(//*[@os='i'])"/>
- 
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/mpc.xml"
-+    xpointer="xpointer(//*[@os='j'])"/>
-+
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/mpc.xml"
-+    xpointer="xpointer(//*[@os='k'])"/>
-+
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/mpc.xml"
-+    xpointer="xpointer(//*[@os='l'])"/>
-+
-   </sect2>
- 
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-diff -ru /home/jp/a/BOOK/final-system/multilib/mpc-n32.xml BOOK/final-system/multilib/mpc-n32.xml
---- /home/jp/a/BOOK/final-system/multilib/mpc-n32.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/mpc-n32.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -40,14 +40,6 @@
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/mpc.xml"
--    xpointer="xpointer(//*[@os='e'])"/>
--
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/mpc.xml"
--    xpointer="xpointer(//*[@os='f'])"/>
--
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/mpc.xml"
-     xpointer="xpointer(//*[@os='g'])"/>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-@@ -58,6 +50,10 @@
-     href="../common/mpc.xml"
-     xpointer="xpointer(//*[@os='i'])"/>
- 
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/mpc.xml"
-+    xpointer="xpointer(//*[@os='j'])"/>
-+
-   </sect2>
- 
-   <sect2 role="content">
-diff -ru /home/jp/a/BOOK/final-system/multilib/mpc.xml BOOK/final-system/multilib/mpc.xml
---- /home/jp/a/BOOK/final-system/multilib/mpc.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/mpc.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -40,14 +40,6 @@
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/mpc.xml"
--    xpointer="xpointer(//*[@os='e'])"/>
--
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/mpc.xml"
--    xpointer="xpointer(//*[@os='f'])"/>
--
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/mpc.xml"
-     xpointer="xpointer(//*[@os='g'])"/>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-@@ -58,6 +50,10 @@
-     href="../common/mpc.xml"
-     xpointer="xpointer(//*[@os='i'])"/>
- 
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/mpc.xml"
-+    xpointer="xpointer(//*[@os='j'])"/>
-+
-   </sect2>
- 
-   <sect2 role="content">
-diff -ru /home/jp/a/BOOK/final-system/multilib/mpfr-64bit.xml BOOK/final-system/multilib/mpfr-64bit.xml
---- /home/jp/a/BOOK/final-system/multilib/mpfr-64bit.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/mpfr-64bit.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -34,8 +34,9 @@
-     xpointer="xpointer(//*[@os='a'])"/>
- 
- <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
--LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
--  ./configure --prefix=/usr --libdir=/usr/lib64 --enable-shared</userinput></screen>
-+    LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
-+    ./configure --prefix=/usr --libdir=/usr/lib64 \
-+    --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/mpfr.xml"
-@@ -61,10 +62,6 @@
-     href="../common/mpfr.xml"
-     xpointer="xpointer(//*[@os='h'])"/>
- 
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/mpfr.xml"
--    xpointer="xpointer(//*[@os='i'])"/>
--
-   </sect2>
- 
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-diff -ru /home/jp/a/BOOK/final-system/multilib/mpfr-n32.xml BOOK/final-system/multilib/mpfr-n32.xml
---- /home/jp/a/BOOK/final-system/multilib/mpfr-n32.xml	2014-05-11 16:24:52.646516678 +0200
-+++ BOOK/final-system/multilib/mpfr-n32.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -35,8 +35,9 @@
-     xpointer="xpointer(//*[@os='a'])"/>
- 
- <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \
--LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
--  ./configure --prefix=/usr --libdir=/usr/lib32 --enable-shared</userinput></screen>
-+    LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
-+    ./configure --prefix=/usr --libdir=/usr/lib32 \
-+    --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/mpfr.xml"
-@@ -62,10 +63,6 @@
-     href="../common/mpfr.xml"
-     xpointer="xpointer(//*[@os='h'])"/>
- 
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/mpfr.xml"
--    xpointer="xpointer(//*[@os='i'])"/>
--
-   </sect2>
- 
-   <sect2 role="content">
-diff -ru /home/jp/a/BOOK/cross-tools/common/mpc.xml BOOK/cross-tools/common/mpc.xml
---- /home/jp/a/BOOK/cross-tools/common/mpc.xml	2014-05-11 16:24:52.642516678 +0200
-+++ BOOK/cross-tools/common/mpc.xml	2014-10-03 20:44:43.904339261 +0200
-@@ -12,7 +12,7 @@
- 
-   <indexterm zone="ch-cross-tools-mpc">
-     <primary sortas="a-MPC">MPC</primary>
--    <secondary>cross-tools</secondary>
-+    <secondary>cross tools</secondary>
-   </indexterm>
- 
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-diff -ru /home/jp/a/BOOK/final-system/multilib/mpfr.xml BOOK/final-system/multilib/mpfr.xml
---- /home/jp/a/BOOK/final-system/multilib/mpfr.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/mpfr.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -35,8 +35,9 @@
-     xpointer="xpointer(//*[@os='a'])"/>
- 
- <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \
--LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
--  ./configure --prefix=/usr --host=${CLFS_TARGET32} --enable-shared</userinput></screen>
-+    LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
-+    ./configure --prefix=/usr --host=${CLFS_TARGET32} \
-+    --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/mpfr.xml"
-@@ -62,10 +63,6 @@
-     href="../common/mpfr.xml"
-     xpointer="xpointer(//*[@os='h'])"/>
- 
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/mpfr.xml"
--    xpointer="xpointer(//*[@os='i'])"/>
--
-   </sect2>
- 
-   <sect2 role="content">
-diff -ru /home/jp/a/BOOK/final-system/multilib/ncurses-64bit.xml BOOK/final-system/multilib/ncurses-64bit.xml
---- /home/jp/a/BOOK/final-system/multilib/ncurses-64bit.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/ncurses-64bit.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -36,7 +36,7 @@
- <screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-    ./configure --prefix=/usr --libdir=/lib64 \
-    --with-shared --without-debug --enable-widec \
--   --with-manpage-format=normal \
-+   --with-manpage-format=normal --enable-pc-files \
-    --with-default-terminfo-dir=/usr/share/terminfo</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-@@ -73,18 +73,18 @@
- 
-     <para os="j">Create symlinks in <filename class="directory">/usr/lib64:</filename></para>
- 
--<screen os="k"><userinput>rm -v /lib64/lib{ncursesw,menuw,panelw,formw}.so
--ln -svf ../../lib64/libncursesw.so.5 /usr/lib64/libncursesw.so
--ln -svf ../../lib64/libmenuw.so.5 /usr/lib64/libmenuw.so
--ln -svf ../../lib64/libpanelw.so.5 /usr/lib64/libpanelw.so
--ln -svf ../../lib64/libformw.so.5 /usr/lib64/libformw.so</userinput></screen>
-+<screen os="k"><userinput>ln -svf ../../lib64/$(readlink /lib64/libncursesw.so) /usr/lib64/libncursesw.so
-+ln -svf ../../lib64/$(readlink /lib64/libmenuw.so) /usr/lib64/libmenuw.so
-+ln -svf ../../lib64/$(readlink /lib64/libpanelw.so) /usr/lib64/libpanelw.so
-+ln -svf ../../lib64/$(readlink /lib64/libformw.so) /usr/lib64/libformw.so
-+rm -v /lib64/lib{ncursesw,menuw,panelw,formw}.so</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="ncurses.xml"
-     xpointer="xpointer(//*[@os='l'])"/>
- 
- <screen os="m"><userinput>for lib in curses ncurses form panel menu ; do
--        echo "INPUT(-l${lib}w)" > /usr/lib64/lib${lib}.so
-+        echo "INPUT(-l${lib}w)" > /usr/lib64/lib${lib}.so
-         ln -sfv lib${lib}w.a /usr/lib64/lib${lib}.a
- done
- ln -sfv libcurses.so /usr/lib64/libcursesw.so
-@@ -95,11 +95,6 @@
- ln -sfv ncursesw5-config-64 /usr/bin/ncurses5-config-64
- ln -sfv ncursesw5-config /usr/bin/ncurses5-config</userinput></screen>
- 
--    <para os="n">Now we will create a symlink for /usr/share/terminfo in
--    <filename class="directory">/usr/lib64</filename> for compatibility:</para>
--
--<screen os="o"><userinput>ln -sfv ../share/terminfo /usr/lib64/terminfo</userinput></screen>
--
-   </sect2>
- 
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-diff -ru /home/jp/a/BOOK/final-system/multilib/ncurses-n32.xml BOOK/final-system/multilib/ncurses-n32.xml
---- /home/jp/a/BOOK/final-system/multilib/ncurses-n32.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/ncurses-n32.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -37,7 +37,7 @@
- <screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
-    ./configure --prefix=/usr --libdir=/lib32 \
-    --with-shared --without-debug --enable-widec \
--   --with-manpage-format=normal \
-+   --with-manpage-format=normal --enable-pc-files \
-    --with-default-terminfo-dir=/usr/share/terminfo</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-@@ -73,18 +73,18 @@
- 
-     <para os="j">Create symlinks in <filename class="directory">/usr/lib32:</filename></para>
- 
--<screen os="k"><userinput>rm -v /lib32/lib{ncursesw,menuw,panelw,formw}.so
--ln -svf ../../lib32/libncursesw.so.5 /usr/lib32/libncursesw.so
--ln -svf ../../lib32/libmenuw.so.5 /usr/lib32/libmenuw.so
--ln -svf ../../lib32/libpanelw.so.5 /usr/lib32/libpanelw.so
--ln -svf ../../lib32/libformw.so.5 /usr/lib32/libformw.so</userinput></screen>
-+<screen os="k"><userinput>ln -svf ../../lib32/$(readlink /lib32/libncursesw.so) /usr/lib32/libncursesw.so
-+ln -svf ../../lib32/$(readlink /lib32/libmenuw.so) /usr/lib32/libmenuw.so
-+ln -svf ../../lib32/$(readlink /lib32/libpanelw.so) /usr/lib32/libpanelw.so
-+ln -svf ../../lib32/$(readlink /lib32/libformw.so) /usr/lib32/libformw.so
-+rm -v /lib32/lib{ncursesw,menuw,panelw,formw}.so</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="ncurses.xml"
-     xpointer="xpointer(//*[@os='l'])"/>
- 
- <screen os="m"><userinput>for lib in curses ncurses form panel menu ; do
--        echo "INPUT(-l${lib}w)" > /usr/lib32/lib${lib}.so
-+        echo "INPUT(-l${lib}w)" > /usr/lib32/lib${lib}.so
-         ln -sfv lib${lib}w.a /usr/lib32/lib${lib}.a
- done
- ln -sfv libcurses.so /usr/lib32/libcursesw.so
-@@ -94,11 +94,6 @@
- ln -sfv libncurses++w.a /usr/lib32/libncurses++.a
- ln -sfv ncurses5w-config-32 /usr/bin/ncurses5-config-32</userinput></screen>
- 
--    <para os="n">Now we will create a symlink for /usr/share/terminfo in
--    <filename class="directory">/usr/lib32</filename> for compatibility:</para>
--
--<screen os="o"><userinput>ln -sfv ../share/terminfo /usr/lib32/terminfo</userinput></screen>
--
-   </sect2>
- 
-   <sect2 role="content">
-diff -ru /home/jp/a/BOOK/final-system/multilib/ncurses.xml BOOK/final-system/multilib/ncurses.xml
---- /home/jp/a/BOOK/final-system/multilib/ncurses.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/ncurses.xml	2014-10-03 20:44:43.920339262 +0200
-@@ -37,11 +37,15 @@
- <screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
-    ./configure --prefix=/usr --libdir=/lib \
-    --with-shared --without-debug --enable-widec \
--   --with-manpage-format=normal \
-+   --with-manpage-format=normal --enable-pc-files \
-    --with-default-terminfo-dir=/usr/share/terminfo</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/ncurses.xml"
-+    xpointer="xpointer(//*[@os='b1'])"/>
-+
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/ncurses.xml"
-     xpointer="xpointer(//*[@os='c'])"/>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-@@ -86,7 +90,7 @@
-     xpointer="xpointer(//*[@os='l'])"/>
- 
- <screen os="m"><userinput>for lib in curses ncurses form panel menu ; do
--        echo "INPUT(-l${lib}w)" > /usr/lib/lib${lib}.so
-+        echo "INPUT(-l${lib}w)" > /usr/lib/lib${lib}.so
-         ln -sfv lib${lib}w.a /usr/lib/lib${lib}.a
- done
- ln -sfv libcurses.so /usr/lib/libcursesw.so
-@@ -96,14 +100,6 @@
- ln -sfv libncurses++w.a /usr/lib/libncurses++.a
- ln -sfv ncursesw5-config-32 /usr/bin/ncurses5-config-32</userinput></screen>
- 
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/ncurses.xml"
--    xpointer="xpointer(//*[@os='n'])"/>
--
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/ncurses.xml"
--    xpointer="xpointer(//*[@os='o'])"/>
--
-   </sect2>
- 
-   <sect2 role="content">
 diff -ru /home/jp/a/BOOK/final-system/multilib/perl-64bit.xml BOOK/final-system/multilib/perl-64bit.xml
 --- /home/jp/a/BOOK/final-system/multilib/perl-64bit.xml	2014-05-11 16:24:52.646516678 +0200
 +++ BOOK/final-system/multilib/perl-64bit.xml	2014-10-03 20:44:43.920339262 +0200
@@ -2492,1312 +1156,8 @@
        </listitem>
        <listitem>
          <para>The package or section in which the problem was encountered.</para>
-diff -ru /home/jp/a/BOOK/introduction/common/changelog.xml BOOK/introduction/common/changelog.xml
---- /home/jp/a/BOOK/introduction/common/changelog.xml	2014-05-11 16:24:52.626516679 +0200
-+++ BOOK/introduction/common/changelog.xml	2014-10-03 20:44:43.928339262 +0200
-@@ -30,12 +30,1099 @@
-           <para>[name] - Changelog entry.</para>
-         </listitem>
-         <listitem>
--          <para>[name] - Another changelog entry.</para>
-+          <para>[name] - Previous changelog entry.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+-->
-+
-+    <listitem>
-+      <para>26 September 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harriongton] - Update Bash 4.3 branch update
-+          to patch level 26.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harriongton] - Update Readline 6.3 branch update
-+          to patch level 8.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harriongton] - Update Linux sublevel patch to 
-+          3.14.19.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harriongton] - Update Vim 7.4 branch update patch
-+          to level 460.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>18 August 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Removed obsolete --with-tls and --with-__thread
-+          options from Cross-Tools Glibc builds - those options have long since
-+          been removed from Glibc.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>17 August 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Combined Makefile modification commands in
-+          Boot section Shadow install into one command.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Removed redundant command explanation from
-+          Less installation page.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>14 August 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Disabled LTO for systemd build so it doesn't link
-+          to libgcc_s. Thanks to Armin K. for the solution.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Removed obsolete command to disable test lib
-+          in Glibc instructions.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>10 August 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Removed several switches from GCC builds for options
-+          that are enabled by default.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Removed --enable-multibyte switch from Vim pages,
-+          since multibyte support is enabled by default.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Removed --enable-shared switch from CLooG pages;
-+          shared libraries are built by default.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>09 August 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Redo top index to list by arch, then 32/64/multilib
-+          within each arch.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Removed "M4=m4" from final-system Bison and Flex
-+          pages, since m4 is now installed before them.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>07 August 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Updated Linux sublevel patch to 3.14.16.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>05 August 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Reversed change to Vim's docs location, so that
-+          Vim can find its help files.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>01 August 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Updated Linux sublevel to 3.14.15.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Build Pkg-config-lite before Ncurses in the final
-+          system, so that Ncurses will install .pc files.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Move Bzip2 before Perl and modify Perl instructions
-+          to use system-install Bzip2. Solution borrowed from LFS.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>28 July 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Removed unneeded notes about the importance of the
-+          testuites for GMP, MPFR, MPC, ISL, and CLooG.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>24 July 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Added config flag descriptions to kernel config
-+          pages. Thanks to Hazel Russman for the idea.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Removed commands to recreate /usr/share/info
-+          to reduce possible user confusion.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>21 July 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Update MPFR 3.1.2 fixes patch for patch
-+          level 10 update.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Update VIM 7.4 Branch Update patch to
-+          patch level 373.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Update Linux to 3.14.13.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>18 July 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Changed title on Linux Headers installation pages
-+          to reduce potential confusion with previous Linux-Headers package.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>17 July 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Updated D-Bus to 1.8.6 for security fixes.
-+          Closes ticket <ulink url="&clfs-ticket-root;974">#974</ulink>.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>14 July 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Modified instructions for mounting file systems
-+          for chroot so that they are all mounted before entering chroot, and
-+          added a tmpfs on /run. Took solution for /dev/shm symlink from LFS.
-+          Fixes ticket <ulink url="&clfs-ticket-root;971">#971</ulink>.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Updated Linux sublevel to 3.14.12.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>10 July 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Add back instruction to create /var/log/lastlog,
-+          so that it can actually be used.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>02 July 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Update Linux subelevel patch to 3.14.10.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>30 June 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Added documentation installation instructions
-+          for Zlib.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>27 June 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Updated KMOD to 18. Fixes ticket
-+          <ulink url="&clfs-ticket-root;965">#965</ulink>.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>24 June 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Remove reference to a non-existent man page
-+          from <filename>timesyncd.conf</filename>.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Prevent systemd from running
-+          <command>setcap</command> during installation.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Prevent <command>systemd-fsck</command> from using
-+          <command>fsck -l</command>, to avoid boot errors. Fixes ticket
-+          <ulink url="&clfs-ticket-root;968">#968</ulink>.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>23 June 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Added info about systemd-timesyncd to network
-+          configuration section. Fixes ticket
-+          <ulink url="&clfs-ticket-root;958">#958</ulink>.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>20 June 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Remove <command>make -C man install
-+          </command> from final-system KMOD as man pages are installed during
-+          <command>make install</command>.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Add Linux sublevel patch.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Changed GMP documentation installation instructions
-+          to use the Makefile to install docs instead of doing so manually.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>17 June 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Use --with-isl=system for temp-system
-+          CLooG.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>17 June 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Move Man-DB right after Libpipeline.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>15 June 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Added commands to create and install HTML
-+          documentation for MPC.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>13 June 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Update D-Bus to 1.8.4.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Update File to 5.19.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Text updates to kernel installation page.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>11 June 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Placed file before findutils in temp-system.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>10 June 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Upgraded Gettext to 0.19.1.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>04 June 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Added Introduction page to final-preps.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>03 June 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Moved installation of /tools/include/libiberty.h
-+          from Cross-Tools to Temp-System.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Moved creation of /var/run symlink to a more
-+          appropriate location in the Creating Directories page.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>02 June 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Upgraded Gettext to 0.19.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>01 June 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Upgraded GCC to 4.8.3.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Upgraded Eudev to 1.7.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>31 May 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Update Check to 0.9.13.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Update Linux to 3.14.5.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Update Vim 7.4 branch update patch to
-+          level 316.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>30 May 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Add --host=${CLFS_TARGET} during
-+          cross-tools Pkg-config configure.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>29 May 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Update Perl to 5.20.0.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Edited "how" page - removed details about
-+          booting/chrooting and moved them to the "choose" page for temp-system.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>28 May 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Upgrade Systemd to 213.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Upgrade TZData to 2014d.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Upgrade Man-pages to 3.68.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>25 May 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Upgrade Grep to 2.19.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>24 May 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Moved Bc from Cross-Tools to Boot section, as it's
-+          only needed to compile the kernel.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Moved "About ${CLFS}" page from final-preps to
-+          partitioning - best to have the page explaining ${CLFS} before it's
-+          actually used.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>22 May 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Swapped build order of Linux-headers and File in
-+          Cross-Tools - no particular reason for File to be after
-+          Linux-headers, so just make them alphabetical.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>21 May 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Rewrote Udev page in system-config section.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Moved creation of /etc/fstab to system-config.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Update Man-pages to 3.67.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>19 May 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Added commands to unset CFLAGS and CXXFLAGS to the
-+          clfs user's default .bashrc, and removed the separate page where
-+          this was done.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Removed separate "Build flags" pages and moved that
-+          info to "Build Variables" pages, and moved those from cross-tools
-+          to final-preps.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>18 May 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Added Pkg-config-lite to Cross-Tools and removed
-+          PKG_CONFIG parameters from temp-system and boot packages.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>17 May 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Upgrade TZData to 2014c.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Add --disable-werror for cross-tools Binutils.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>11 May 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Added explanations for Essential Symlinks.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>08 May 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Update Man-pages to 3.66.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Add GDBM 1.11 to the books.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Add Libpipeline 1.3.0 to the books.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Add Man-DB 2.6.7.1 to the books.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Remove Man-1.6g from the books.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Remove zsoelim link from Groff.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>06 May 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Removed unneeded configure switches specifying
-+          GMP/MPFR/MPC/ISL/CLOOG in /tools.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Removed unneeded --libexecdir switches from
-+          temp-system GCC.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>02 May 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Removed command to copy gconv-modules in Glibc
-+          instructions, as it is no longer needed.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>30 April 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Added "PKG_CONFIG=" to boot section kmod commands,
-+          otherwise it will use pkg-config to find the "bash-completion"
-+          package and install stuff to that prefix if found. Thanks to boloco
-+          in IRC for finding this.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Uprade DBus to 1.8.2.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>28 April 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Remove all mentions of Alpha architecture, as it has
-+          not been tested for a long time.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>27 April 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Update IPRoute2 to 3.14.0.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>27 April 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Updated Acknowledgements page.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Update Linux to 3.14.2.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>26 April 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Renamed bootscripts package to boot-scripts
-+          (thanks to William Harrington for the suggestion) and removed the
-+          patch as it is not needed for the new package.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Renamed bootscripts chapter to "System Configuration".</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Update Util-linux to 2.24.2.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Added new page about how to view the book from
-+          inside the temporary boot environment.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Don't move binaries from Findutils or Psmisc to /bin,
-+          as they're no longer needed there.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Update Vim 7.4 branch update patch to
-+          level 265.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>24 April 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Update Eudev to 1.6.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Update Man-pages to 3.65.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Update Bash branch update patch to level           11.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Update Readline branch update patch to
-+          level 5.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>22 April 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Removed several virtual filesystems from ${CLFS}/fstab
-+          for the boot method, as they're already mounted by the bootscript.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Removed creation of gtbl and geqn symlinks, as they
-+          are no longer needed.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>21 April 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Re-added manual creation of /usr/bin/perl symlink,
-+          as it is not created automatically under some circumstances.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>20 April 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Reorganized "boot" section to allow everything
-+          to be installed into /tools, remove the need to chown ${CLFS} to the
-+          clfs user, and generally make the chapter's instructions flow better.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>18 April 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Added --disable-makeinstall-setuid to temp-system
-+          Util-linux, as nothing there needs to be suid.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>16 April 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Removed creation of /usr/bin/perl symlink, as
-+          Perl creates a link itself when installed.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>13 April 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Updated most packages in the Boot section to install
-+          into /tools instead of $CLFS. Thanks to Martin Ward and
-+          William Harrington for assistance.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>12 April 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Modified sysvinit installation to allow it
-+          to use /tools/etc/inittab and /tools/sbin/agetty.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Moved Util-linux installation out of boot/chroot
-+          sections into the temp-system, as it can be installed the same
-+          way with either method.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>11 April 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Updated MPC to 1.0.2.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Removed unneeded --disable-login and --disable-su
-+          switches from Util-linux configure in boot/chroot sections.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>09 April 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Update Eudev to 1.5.3.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>09 April 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Remove obsolete --enable-cloog-backend
-+          parameter from GCC configure.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Remove unneeded
-+          --disable-isl-version-check parameter from GCC configure.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Update Gawk to 4.1.1.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>08 April 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Add versioned doc directories for
-+          Automake, DBus, Flex, Gawk, Gettext, GMP, IPRoute2, KBD, MPFR,
-+          Readline, Sed, Tar, Util-linux and XZ.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>06 April 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Update KMOD to 17.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Update Man-pages to 3.64.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>05 April 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Move Flex before Bison in final system
-+          and remove bison and flex from temp system.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Add M4=m4 before configure command in
-+          final-system Bison and Flex.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Remove Bison and Flex from temp system.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Move M4 before GMP in final-system and
-+          remove M4 from temp system.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>02 April 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Add test commands to Attr and Acl.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>30 March 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Modified network section to split systemd/sysconfig
-+          network configurations.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Removed instructions to install systemd manpages -
-+          they are now automatically installed by default.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Updated installed program lists for several packages.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Remove link of libl to libfl during Flex installation.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Update DHCPCD to 6.3.2.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Update VIM 7.4 patch to level 229.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Update Bash 4.3 patch to level 8.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Update Readline 6.3 patch to level 3.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Update GCC 4.8.2 branch update patch to
-+          revision 208943.</para>
-         </listitem>
-       </itemizedlist>
      </listitem>
- 
---->
-+    <listitem>
-+      <para>23 March 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Update Man-pages to 3.63.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>28 March 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Update File to 5.18.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Update Flex to 2.5.39.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Update Linux to 3.12.15.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Update Systemd to 212.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Update Tzdata to 2014b.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Update GMP to 6.0.0a.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Move Bison and Flex before Binutils.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>17 March 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Remove libdbus and Update Systemd to 211.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Add Systemd compat patch to install pkg-config files.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>12 March 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Updated documentation installation instructions
-+          for Readline and Bash.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Deleted --remove-destination parameter when creating
-+          /etc/localtime - it's no longer needed.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Update Man-pages to 3.62.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>10 March 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Update TZData to 2014a.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Update MPFR fixes patch to patch level 5.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>09 March 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Add configure command descriptions and testsuite commands to Systemd.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Update testsuite description for D-BUS.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Add note to final-system Util-Linux regarding extra functionality with libudev.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Add commands and descriptions for <filename>/etc/adjtime</filename>.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>02 March 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Update DHCPCD to 6.3.1.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>27 February 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Update Grep to 2.18.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Update DHCPCD to 6.3.0.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Update Man-pages to 3.61.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Update Readline to 6.3.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Update Bash to 4.3.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>24 February 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Remove installation of nscd tmpfile and unit service file in clfs-network-scripts.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>23 February 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Add commands for <command>nscd</command>  config, runtime, and Systemd unit files installation to GLIBC.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>18 February 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Migrate EGLIBC to GLIBC and upgrade to version 2.19.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Update D-Bus to stable version 1.8.0.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Update File to version 5.17.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Update Grep to version 2.17.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Update Linux to version 3.12.11.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Update Man-pages to version 3.60.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Update Psmisc to version 22.21.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>13 February 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Correct nobody gid to use nogroup gid.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>03 February 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Add configure options to systemd so loadkeys and setfont is searched in /bin instead of /usr/bin.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
- 
-     <listitem>
-       <para>02 February 2014</para>
-@@ -70,29 +1157,145 @@
-         <listitem>
-           <para>[William Harrington] - Update LESS to 462.</para>
-         </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>25 January 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Create a link from /proc/self/mounts to /etc/mtab in boot and chroot createfiles section.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>23 January 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Update text and redo some commands regarding Systemd in the System and Network configuration chapters.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Add a clock configuration script to system configuration chapter with regards to systemd.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Add CLFS-Network-Scripts and add commands to install them in the network configuration chapter.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[William Harrington] - Update Util-linux to 2.24.1.</para>
-+        </listitem>
-         <listitem>
-           <para>[William Harrington] - Update Check to 0.9.12.</para>
-         </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>21 January 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Add D-Bus libraries before Systemd in final-system for a circular dependency issue.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>19 January 2014</para>
-+      <itemizedlist>
-         <listitem>
--          <para>[William Harrington] - Update Dhcpcd 6.2.1.</para>
-+          <para>[William Harrington] - Update DHCPCD to 6.2.1.</para>
-         </listitem>
-         <listitem>
--          <para>[William Harrington] - Update Gettext to 0.18.3.2.</para>
-+          <para>[William Harrington] - Use readlink when creating links for dynamic libraries for zlib, xz, ncurses, and readline.</para>
-         </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>13 January 2014</para>
-+      <itemizedlist>
-         <listitem>
-           <para>[William Harrington] - Update ISL to 0.12.2.</para>
-         </listitem>
-         <listitem>
-           <para>[William Harrington] - Update Man-pages to 3.56.</para>
-         </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>10 January 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[William Harrington] - Migrate Procps to Procps-ng.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>09 January 2014</para>
-+      <itemizedlist>
-         <listitem>
--          <para>[William Harrington] - Update Perl to 5.18.2.</para>
-+          <para>[Chris] - Updated Linux to 3.12.7.</para>
-         </listitem>
-         <listitem>
--          <para>[William Harrington] - Update Util-linux to 2.24.1.</para>
-+          <para>[Chris] - Updated Perl to 5.18.2.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Updated Gettext to 0.18.3.2.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Updated Libcap to 2.24.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Removed unneeded command to create a /usr/lib/terminfo
-+          symlink from Ncurses instructions.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Removed /usr/{doc,info,man} symlinks and edited
-+          instructions for packages to ensure all documentation is installed
-+          to /usr/share.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Moved libcap so it's built just before iputils,
-+          which can use libcap.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>08 January 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Removed commands to create files in /var/run and
-+          /var/log - systemd now used its journal for all logs.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Removed obsolete sed command from temp-system Coreutils.</para>
-         </listitem>
-         <listitem>
--          <para>[William Harrington] - Update Eudev 1.4.</para>
-+          <para>[Chris] - Removed unneeded command to rename stubs-64.h.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Removed unneeded "make configure-host" commands
-+          from Binutils.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Moved Attr and ACL to just after GCC in the final system.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>07 January 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Added command, from LFS, to modify
-+          /tools/lib/libstdc++.la to prevent a /tools reference in the final system.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Use libiberty from GCC, since Binutils no longer
-+          installs it by default.</para>
-         </listitem>
-       </itemizedlist>
-     </listitem>
-@@ -101,6 +1304,10 @@
-       <para>06 January 2014</para>
-       <itemizedlist>
-         <listitem>
-+          <para>[Chris] - Added msgmerge and xgettext to /tools Gettext
-+          installation - needed for attr.</para>
-+        </listitem>
-+        <listitem>
-           <para>[William Harrington] - Update DHCPCD to 6.2.0.</para>
-         </listitem>
-         <listitem>
-@@ -110,11 +1317,35 @@
-     </listitem>
- 
-     <listitem>
--      <para>01 January 2014</para>
-+      <para>05 January 2014</para>
-+      <itemizedlist>
-+        <listitem>
-+          <para>[Chris] - Removed rsyslog and its depedencies, libee and libestr.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Updated Expat to 2.1.0.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Updated Attr to 2.4.47.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Updated D-Bus to 1.6.18.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Updated Libcap to 2.23.</para>
-+        </listitem>
-+      </itemizedlist>
-+    </listitem>
-+
-+    <listitem>
-+      <para>04 January 2014</para>
-       <itemizedlist>
-         <listitem>
--          <para>[Chris] - Added command to EGLIBC instructions to remove
--          extraneous '.x' files from /usr/include/rpcsvc.</para>
-+          <para>[Chris] - Updated Systemd to 208.</para>
-+        </listitem>
-+        <listitem>
-+          <para>[Chris] - Added Gperf, XML::Parser, Intltool, and ACL - needed
-+          by systemd.</para>
-         </listitem>
-       </itemizedlist>
-     </listitem>
+
 diff -ru /home/jp/a/BOOK/introduction/common/how.xml BOOK/introduction/common/how.xml
 --- /home/jp/a/BOOK/introduction/common/how.xml	2014-05-11 16:24:52.626516679 +0200
 +++ BOOK/introduction/common/how.xml	2014-10-03 20:44:43.928339262 +0200



More information about the lfs-traducfr mailing list