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

jmengual at linuxfromscratch.org jmengual at linuxfromscratch.org
Dim 12 Oct 14:08:27 PDT 2014


Author: jmengual
Date: 2014-10-12 23:08:27 +0200 (Sun, 12 Oct 2014)
New Revision: 6592

Modified:
   trunk/clfs/cross-tools/common/mpfr.xml
   trunk/clfs/cross-tools/common/ncurses.xml
   trunk/clfs/final-system/multilib/readline-n32.xml
   trunk/clfs/final-system/multilib/readline.xml
   trunk/clfs/final-system/multilib/sed.xml
   trunk/clfs/final-system/multilib/shadow.xml
   trunk/clfs/final-system/multilib/tar.xml
   trunk/clfs/final-system/multilib/temp-perl.xml
   trunk/clfs/final-system/multilib/texinfo.xml
   trunk/clfs/final-system/multilib/util-linux-64bit.xml
   trunk/clfs/final-system/multilib/util-linux-n32.xml
   trunk/clfs/final-system/multilib/util-linux.xml
   trunk/clfs/final-system/multilib/vim.xml
   trunk/clfs/final-system/multilib/xz-64bit.xml
   trunk/clfs/final-system/multilib/xz-n32.xml
   trunk/clfs/final-system/multilib/xz.xml
   trunk/clfs/final-system/multilib/zlib-64bit.xml
   trunk/clfs/maj
Log:
Suite maj



Modified: trunk/clfs/cross-tools/common/mpfr.xml
===================================================================
--- trunk/clfs/cross-tools/common/mpfr.xml	2014-10-12 20:39:45 UTC (rev 6591)
+++ trunk/clfs/cross-tools/common/mpfr.xml	2014-10-12 21:08:27 UTC (rev 6592)
@@ -12,7 +12,7 @@
 
   <indexterm zone="ch-cross-tools-mpfr">
     <primary sortas="a-MPFR">MPFR</primary>
-    <secondary>cross-tools</secondary>
+    <secondary>cross tools</secondary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -48,14 +48,6 @@
       </varlistentry>
 
       <varlistentry>
-        <term><parameter>--enable-shared</parameter></term>
-        <listitem>
-          <para>Ceci dit à <command>configure</command> de construire les
-          bibliothèques partagées de MPFR.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
         <term><parameter>--with-gmp=/cross-tools</parameter></term>
         <listitem>
           <para>Ceci dit à <command>configure</command> où trouver GMP.</para>

Modified: trunk/clfs/cross-tools/common/ncurses.xml
===================================================================
--- trunk/clfs/cross-tools/common/ncurses.xml	2014-10-12 20:39:45 UTC (rev 6591)
+++ trunk/clfs/cross-tools/common/ncurses.xml	2014-10-12 21:08:27 UTC (rev 6592)
@@ -12,7 +12,7 @@
 
   <indexterm zone="ch-cross-tools-ncurses">
     <primary sortas="a-Ncurses">Ncurses</primary>
-    <secondary>cross-tools</secondary>
+    <secondary>cross tools</secondary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -22,6 +22,16 @@
   <sect2 role="installation">
     <title>Installation de Ncurses</title>
 
+    <para os="e1">Quand Ncurses est compilé, il exécute <command>tic</command>
+    pour créer une base de données terminfo dans
+    <filename class="directory">${prefix}/share/terminfo</filename>. Si
+    possible, <filename>Makefile</filename> utilisera le binaire
+    <command>tic</command> qu'on vient de compiler dans l'arborescence de ses
+    sources mais cela ne fonctionne pas quand Ncurses est compilé de façon
+    croisée. Pour permettre à la construction de Ncurses au <xref linkend="chapter-temp-system" /> 
+    de réussir, nous allons construire et installer un programme <command>tic</command>  
+    exécutable sur le systeème.</para>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../temp-system/common/ncurses.xml"
     xpointer="xpointer(//*[@os='p1'])"/>

Modified: trunk/clfs/final-system/multilib/readline-n32.xml
===================================================================
--- trunk/clfs/final-system/multilib/readline-n32.xml	2014-10-12 20:39:45 UTC (rev 6591)
+++ trunk/clfs/final-system/multilib/readline-n32.xml	2014-10-12 21:08:27 UTC (rev 6592)
@@ -35,7 +35,8 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
-   ./configure --prefix=/usr --libdir=/lib32</userinput></screen>
+   ./configure --prefix=/usr --libdir=/lib32 \
+    --docdir=/usr/share/doc/readline-&readline-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="readline.xml"
@@ -61,24 +62,17 @@
     href="readline.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
+<screen os="i"><userinput>mv -v /lib32/lib{readline,history}.a /usr/lib32</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
+    <para os="j">Ensuite, reliez les bibliothèques dynamiques de
+    <filename class="directory">/usr/lib32</filename> et supprimez les fichiers
+    <filename class="extension">.so</filename> de
+    <filename class="directory">/lib32</filename>.</para>
 
-<screen os="k"><userinput>mv -v /lib32/lib{readline,history}.a /usr/lib32</userinput></screen>
+<screen os="k"><userinput>ln -svf ../../lib32/$(readlink /lib32/libreadline.so) /usr/lib32/libreadline.so
+ln -svf ../../lib32/$(readlink /lib32/libhistory.so) /usr/lib32/libhistory.so
+rm -v /lib32/lib{readline,history}.so</userinput></screen>
 
-    <para os="l">Ensuite, supprimez les fichiers <filename class="extension">.so</filename>
-    dans <filename class="directory">/lib32</filename> et recréez les liens dans 
-    <filename class="directory">/usr/lib32</filename>.</para>
-
-<screen os="m"><userinput>rm -v /lib32/lib{readline,history}.so
-ln -svf ../../lib32/libreadline.so.&readline-version2; /usr/lib32/libreadline.so
-ln -svf ../../lib32/libhistory.so.&readline-version2; /usr/lib32/libhistory.so</userinput></screen>
-
   </sect2>
 
  <sect2 role="content">

Modified: trunk/clfs/final-system/multilib/readline.xml
===================================================================
--- trunk/clfs/final-system/multilib/readline.xml	2014-10-12 20:39:45 UTC (rev 6591)
+++ trunk/clfs/final-system/multilib/readline.xml	2014-10-12 21:08:27 UTC (rev 6592)
@@ -35,7 +35,8 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
-   ./configure --prefix=/usr --libdir=/lib</userinput></screen>
+   ./configure --prefix=/usr --libdir=/lib \
+    --docdir=/usr/share/doc/readline-&readline-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/readline.xml"
@@ -73,14 +74,6 @@
     href="../common/readline.xml"
     xpointer="xpointer(//*[@os='k'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
   </sect2>
 
  <sect2 role="content">

Modified: trunk/clfs/final-system/multilib/sed.xml
===================================================================
--- trunk/clfs/final-system/multilib/sed.xml	2014-10-12 20:39:45 UTC (rev 6591)
+++ trunk/clfs/final-system/multilib/sed.xml	2014-10-12 21:08:27 UTC (rev 6592)
@@ -26,7 +26,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-   --bindir=/bin</userinput></screen>
+   --bindir=/bin --docdir=/usr/share/doc/sed-&sed-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/sed.xml"

Modified: trunk/clfs/final-system/multilib/shadow.xml
===================================================================
--- trunk/clfs/final-system/multilib/shadow.xml	2014-10-12 20:39:45 UTC (rev 6591)
+++ trunk/clfs/final-system/multilib/shadow.xml	2014-10-12 21:08:27 UTC (rev 6592)
@@ -91,6 +91,10 @@
     href="../common/shadow.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/shadow.xml"
+    xpointer="xpointer(//*[@os='w'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

Modified: trunk/clfs/final-system/multilib/tar.xml
===================================================================
--- trunk/clfs/final-system/multilib/tar.xml	2014-10-12 20:39:45 UTC (rev 6591)
+++ trunk/clfs/final-system/multilib/tar.xml	2014-10-12 21:08:27 UTC (rev 6592)
@@ -61,6 +61,14 @@
     href="../common/tar.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/tar.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/tar.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

Modified: trunk/clfs/final-system/multilib/temp-perl.xml
===================================================================
--- trunk/clfs/final-system/multilib/temp-perl.xml	2014-10-12 20:39:45 UTC (rev 6591)
+++ trunk/clfs/final-system/multilib/temp-perl.xml	2014-10-12 21:08:27 UTC (rev 6592)
@@ -28,10 +28,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/temp-perl.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/temp-perl.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

Modified: trunk/clfs/final-system/multilib/texinfo.xml
===================================================================
--- trunk/clfs/final-system/multilib/texinfo.xml	2014-10-12 20:39:45 UTC (rev 6591)
+++ trunk/clfs/final-system/multilib/texinfo.xml	2014-10-12 21:08:27 UTC (rev 6592)
@@ -51,14 +51,6 @@
     href="../common/texinfo.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

Modified: trunk/clfs/final-system/multilib/util-linux-64bit.xml
===================================================================
--- trunk/clfs/final-system/multilib/util-linux-64bit.xml	2014-10-12 20:39:45 UTC (rev 6591)
+++ trunk/clfs/final-system/multilib/util-linux-64bit.xml	2014-10-12 21:08:27 UTC (rev 6592)
@@ -27,10 +27,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='n'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --libdir=/lib64 \
-     --enable-write</userinput></screen>
+    --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/util-linux.xml"
@@ -60,14 +64,6 @@
     href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

Modified: trunk/clfs/final-system/multilib/util-linux-n32.xml
===================================================================
--- trunk/clfs/final-system/multilib/util-linux-n32.xml	2014-10-12 20:39:45 UTC (rev 6591)
+++ trunk/clfs/final-system/multilib/util-linux-n32.xml	2014-10-12 21:08:27 UTC (rev 6592)
@@ -27,7 +27,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --libdir=/lib32 \
-    --enable-write</userinput></screen>
+    --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/util-linux.xml"
@@ -57,14 +57,6 @@
     href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
   </sect2>
 
   <sect2 role="content">

Modified: trunk/clfs/final-system/multilib/util-linux.xml
===================================================================
--- trunk/clfs/final-system/multilib/util-linux.xml	2014-10-12 20:39:45 UTC (rev 6591)
+++ trunk/clfs/final-system/multilib/util-linux.xml	2014-10-12 21:08:27 UTC (rev 6592)
@@ -27,7 +27,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --libdir=/lib \
-    --enable-write</userinput></screen>
+    --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/util-linux.xml"
@@ -43,14 +43,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='dummy1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='dummy2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

Modified: trunk/clfs/final-system/multilib/vim.xml
===================================================================
--- trunk/clfs/final-system/multilib/vim.xml	2014-10-12 20:39:45 UTC (rev 6591)
+++ trunk/clfs/final-system/multilib/vim.xml	2014-10-12 21:08:27 UTC (rev 6592)
@@ -47,15 +47,10 @@
     xpointer="xpointer(//*[@os='d'])"/>
 
 <screen os="e"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-  ./configure --prefix=/usr \
-    --enable-multibyte</userinput></screen>
+  ./configure --prefix=/usr</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

Modified: trunk/clfs/final-system/multilib/xz-64bit.xml
===================================================================
--- trunk/clfs/final-system/multilib/xz-64bit.xml	2014-10-12 20:39:45 UTC (rev 6591)
+++ trunk/clfs/final-system/multilib/xz-64bit.xml	2014-10-12 21:08:27 UTC (rev 6592)
@@ -11,7 +11,7 @@
   <title>XZ Utils-&xz-version; 64 bits</title>
 
   <indexterm zone="ch-system-xz">
-    <primary sortas="a-XZ-Utils">XZ-Utils</primary>
+    <primary sortas="a-XZ Utils">XZ Utils</primary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -19,13 +19,14 @@
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation de XZ-Utils</title>
+    <title>Installation de XZ Utils</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/xz.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
+    --libdir=/usr/lib64 --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/xz.xml"
@@ -64,7 +65,7 @@
     xpointer="xpointer(//*[@os='j'])"/>
 
 <screen os="k"><userinput>mv -v /usr/lib64/liblzma.so.* /lib64
-ln -svf ../../lib64/liblzma.so.&xz-version; /usr/lib64/liblzma.so</userinput></screen>
+ln -sfv ../../lib64/$(readlink /usr/lib64/liblzma.so) /usr/lib64/liblzma.so</userinput></screen>
 
   </sect2>
 

Modified: trunk/clfs/final-system/multilib/xz-n32.xml
===================================================================
--- trunk/clfs/final-system/multilib/xz-n32.xml	2014-10-12 20:39:45 UTC (rev 6591)
+++ trunk/clfs/final-system/multilib/xz-n32.xml	2014-10-12 21:08:27 UTC (rev 6592)
@@ -11,7 +11,7 @@
   <title>Bibliothèques XZ Utils-&xz-version; N32</title>
 
   <indexterm zone="ch-system-xz-n32">
-    <primary sortas="a-XZ-Utils">XZ-Utils</primary>
+    <primary sortas="a-XZ Utils">XZ Utils</primary>
     <secondary>N32</secondary>
   </indexterm>
 
@@ -26,7 +26,9 @@
     href="xz.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
+    --libdir=/usr/lib32 --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="xz.xml"
     xpointer="xpointer(//*[@os='c'])"/>
@@ -54,7 +56,7 @@
     xpointer="xpointer(//*[@os='j'])"/>
  
 <screen os="k"><userinput>mv -v /usr/lib32/liblzma.so.* /lib32
-ln -svf ../../lib32/liblzma.so.&xz-version; /usr/lib32/liblzma.so</userinput></screen>
+ln -sfv ../../lib32/$(readlink /usr/lib32/liblzma.so) /usr/lib32/liblzma.so</userinput></screen>
 
   </sect2>
 

Modified: trunk/clfs/final-system/multilib/xz.xml
===================================================================
--- trunk/clfs/final-system/multilib/xz.xml	2014-10-12 20:39:45 UTC (rev 6591)
+++ trunk/clfs/final-system/multilib/xz.xml	2014-10-12 21:08:27 UTC (rev 6592)
@@ -11,7 +11,7 @@
   <title>Outils XZ Utils-&xz-version; 32 bits</title>
 
   <indexterm zone="ch-system-xz-32">
-    <primary sortas="a-XZ-Utils">XZ-Utils</primary>
+    <primary sortas="a-XZ Utils">XZ Utils</primary>
     <secondary>32 bits</secondary>
   </indexterm>
 
@@ -26,7 +26,8 @@
     href="../common/xz.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/xz-&xz-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/xz.xml"

Modified: trunk/clfs/final-system/multilib/zlib-64bit.xml
===================================================================
--- trunk/clfs/final-system/multilib/zlib-64bit.xml	2014-10-12 20:39:45 UTC (rev 6591)
+++ trunk/clfs/final-system/multilib/zlib-64bit.xml	2014-10-12 21:08:27 UTC (rev 6592)
@@ -57,12 +57,20 @@
     <para os="h">La commande précédente a installé deux fichiers <filename
     class="extension">.so</filename> dans <filename
     class="directory">/usr/lib64</filename>. Nous allons les déplacer dans
-    <filename class="directory">/lib64</filename> et ensuite les relier à
-    to <filename class="directory">/usr/lib64</filename>:</para>
+    <filename class="directory">/lib64</filename> et ensuite recréer un lien
+    vers <filename class="directory">/usr/lib64</filename> :</para>
 
 <screen os="i"><userinput>mv -v /usr/lib64/libz.so.* /lib64
-ln -svf ../../lib64/libz.so.1 /usr/lib64/libz.so</userinput></screen>
+ln -sfv ../../lib64/$(readlink /usr/lib64/libz.so) /usr/lib64/libz.so</userinput></screen>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

Modified: trunk/clfs/maj
===================================================================
--- trunk/clfs/maj	2014-10-12 20:39:45 UTC (rev 6591)
+++ trunk/clfs/maj	2014-10-12 21:08:27 UTC (rev 6592)
@@ -1,429 +1,3 @@
-diff -ru /home/jp/a/BOOK/final-system/multilib/readline-n32.xml BOOK/final-system/multilib/readline-n32.xml
---- /home/jp/a/BOOK/final-system/multilib/readline-n32.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/readline-n32.xml	2014-10-03 20:44:43.924339262 +0200
-@@ -35,7 +35,8 @@
-     xpointer="xpointer(//*[@os='a'])"/>
- 
- <screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
--   ./configure --prefix=/usr --libdir=/lib32</userinput></screen>
-+   ./configure --prefix=/usr --libdir=/lib32 \
-+    --docdir=/usr/share/doc/readline-&readline-version;</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="readline.xml"
-@@ -61,23 +62,13 @@
-     href="readline.xml"
-     xpointer="xpointer(//*[@os='h'])"/>
- 
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="readline.xml"
--    xpointer="xpointer(//*[@os='i'])"/>
--
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="readline.xml"
--    xpointer="xpointer(//*[@os='j'])"/>
--
--<screen os="k"><userinput>mv -v /lib32/lib{readline,history}.a /usr/lib32</userinput></screen>
-+<screen os="i"><userinput>mv -v /lib32/lib{readline,history}.a /usr/lib32</userinput></screen>
- 
--    <para os="l">Next, remove the <filename class="extension">.so</filename>
--    files in <filename class="directory">/lib32</filename> and relink them into
--    <filename class="directory">/usr/lib32</filename>.</para>
-+    <para os="j">Next, relink the dynamic libraries into <filename class="directory">/usr/lib32</filename> and remove the <filename class="extension">.so</filename> files in <filename class="directory">/lib32</filename>.</para>
- 
--<screen os="m"><userinput>rm -v /lib32/lib{readline,history}.so
--ln -svf ../../lib32/libreadline.so.&readline-version2; /usr/lib32/libreadline.so
--ln -svf ../../lib32/libhistory.so.&readline-version2; /usr/lib32/libhistory.so</userinput></screen>
-+<screen os="k"><userinput>ln -svf ../../lib32/$(readlink /lib32/libreadline.so) /usr/lib32/libreadline.so
-+ln -svf ../../lib32/$(readlink /lib32/libhistory.so) /usr/lib32/libhistory.so
-+rm -v /lib32/lib{readline,history}.so</userinput></screen>
- 
-   </sect2>
- 
-diff -ru /home/jp/a/BOOK/cross-tools/common/mpfr.xml BOOK/cross-tools/common/mpfr.xml
---- /home/jp/a/BOOK/cross-tools/common/mpfr.xml	2014-05-11 16:24:52.642516678 +0200
-+++ BOOK/cross-tools/common/mpfr.xml	2014-10-03 20:44:43.904339261 +0200
-@@ -12,7 +12,7 @@
- 
-   <indexterm zone="ch-cross-tools-mpfr">
-     <primary sortas="a-MPFR">MPFR</primary>
--    <secondary>cross-tools</secondary>
-+    <secondary>cross tools</secondary>
-   </indexterm>
- 
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-@@ -47,14 +47,6 @@
-         </listitem>
-       </varlistentry>
- 
--      <varlistentry>
--        <term><parameter>--enable-shared</parameter></term>
--        <listitem>
--          <para>This tells <command>configure</command> to build MPFR's
--          shared libraries.</para>
--        </listitem>
--      </varlistentry>
--
-       <varlistentry>
-         <term><parameter>--with-gmp=/cross-tools</parameter></term>
-         <listitem>
-diff -ru /home/jp/a/BOOK/final-system/multilib/readline.xml BOOK/final-system/multilib/readline.xml
---- /home/jp/a/BOOK/final-system/multilib/readline.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/readline.xml	2014-10-03 20:44:43.924339262 +0200
-@@ -35,7 +35,8 @@
-     xpointer="xpointer(//*[@os='a'])"/>
- 
- <screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
--   ./configure --prefix=/usr --libdir=/lib</userinput></screen>
-+   ./configure --prefix=/usr --libdir=/lib \
-+    --docdir=/usr/share/doc/readline-&readline-version;</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/readline.xml"
-@@ -73,14 +74,6 @@
-     href="../common/readline.xml"
-     xpointer="xpointer(//*[@os='k'])"/>
- 
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/readline.xml"
--    xpointer="xpointer(//*[@os='l'])"/>
--
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/readline.xml"
--    xpointer="xpointer(//*[@os='m'])"/>
--
-   </sect2>
- 
-  <sect2 role="content">
-diff -ru /home/jp/a/BOOK/final-system/multilib/sed.xml BOOK/final-system/multilib/sed.xml
---- /home/jp/a/BOOK/final-system/multilib/sed.xml	2014-05-11 16:24:52.646516678 +0200
-+++ BOOK/final-system/multilib/sed.xml	2014-10-03 20:44:43.924339262 +0200
-@@ -26,7 +26,7 @@
-     xpointer="xpointer(//*[@os='a'])"/>
- 
- <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
--   --bindir=/bin</userinput></screen>
-+   --bindir=/bin --docdir=/usr/share/doc/sed-&sed-version;</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/sed.xml"
-diff -ru /home/jp/a/BOOK/final-system/multilib/shadow.xml BOOK/final-system/multilib/shadow.xml
---- /home/jp/a/BOOK/final-system/multilib/shadow.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/shadow.xml	2014-10-03 20:44:43.924339262 +0200
-@@ -91,6 +91,10 @@
-     href="../common/shadow.xml"
-     xpointer="xpointer(//*[@os='v'])"/>
- 
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/shadow.xml"
-+    xpointer="xpointer(//*[@os='w'])"/>
-+
-   </sect2>
- 
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-diff -ru /home/jp/a/BOOK/final-system/multilib/tar.xml BOOK/final-system/multilib/tar.xml
---- /home/jp/a/BOOK/final-system/multilib/tar.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/tar.xml	2014-10-03 20:44:43.924339262 +0200
-@@ -69,6 +69,14 @@
-     href="../common/tar.xml"
-     xpointer="xpointer(//*[@os='i'])"/>
- 
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/tar.xml"
-+    xpointer="xpointer(//*[@os='j'])"/>
-+
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/tar.xml"
-+    xpointer="xpointer(//*[@os='k'])"/>
-+
-   </sect2>
- 
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-diff -ru /home/jp/a/BOOK/final-system/multilib/temp-perl.xml BOOK/final-system/multilib/temp-perl.xml
---- /home/jp/a/BOOK/final-system/multilib/temp-perl.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/temp-perl.xml	2014-10-03 20:44:43.924339262 +0200
-@@ -28,10 +28,6 @@
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/temp-perl.xml"
--    xpointer="xpointer(//*[@os='b'])"/>
--
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/temp-perl.xml"
-     xpointer="xpointer(//*[@os='s1'])"/>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-diff -ru /home/jp/a/BOOK/final-system/multilib/texinfo.xml BOOK/final-system/multilib/texinfo.xml
---- /home/jp/a/BOOK/final-system/multilib/texinfo.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/texinfo.xml	2014-10-03 20:44:43.924339262 +0200
-@@ -51,14 +51,6 @@
-     href="../common/texinfo.xml"
-     xpointer="xpointer(//*[@os='g'])"/>
- 
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/texinfo.xml"
--    xpointer="xpointer(//*[@os='h'])"/>
--
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/texinfo.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/util-linux-64bit.xml BOOK/final-system/multilib/util-linux-64bit.xml
---- /home/jp/a/BOOK/final-system/multilib/util-linux-64bit.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/util-linux-64bit.xml	2014-10-03 20:44:43.924339262 +0200
-@@ -27,10 +27,14 @@
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/util-linux.xml"
-+    xpointer="xpointer(//*[@os='n'])"/>
-+
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/util-linux.xml"
-     xpointer="xpointer(//*[@os='a'])"/>
- 
- <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --libdir=/lib64 \
--    --enable-write</userinput></screen>
-+    --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/util-linux.xml"
-@@ -60,14 +64,6 @@
-     href="../common/util-linux.xml"
-     xpointer="xpointer(//*[@os='h'])"/>
- 
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/util-linux.xml"
--    xpointer="xpointer(//*[@os='i'])"/>
--
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/util-linux.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/util-linux-n32.xml BOOK/final-system/multilib/util-linux-n32.xml
---- /home/jp/a/BOOK/final-system/multilib/util-linux-n32.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/util-linux-n32.xml	2014-10-03 20:44:43.924339262 +0200
-@@ -27,7 +27,7 @@
-     xpointer="xpointer(//*[@os='a'])"/>
- 
- <screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --libdir=/lib32 \
--    --enable-write</userinput></screen>
-+    --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/util-linux.xml"
-@@ -57,14 +57,6 @@
-     href="../common/util-linux.xml"
-     xpointer="xpointer(//*[@os='h'])"/>
- 
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/util-linux.xml"
--    xpointer="xpointer(//*[@os='i'])"/>
--
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/util-linux.xml"
--    xpointer="xpointer(//*[@os='j'])"/>
--
-   </sect2>
- 
-   <sect2 role="content">
-diff -ru /home/jp/a/BOOK/final-system/multilib/util-linux.xml BOOK/final-system/multilib/util-linux.xml
---- /home/jp/a/BOOK/final-system/multilib/util-linux.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/util-linux.xml	2014-10-03 20:44:43.924339262 +0200
-@@ -27,7 +27,7 @@
-     xpointer="xpointer(//*[@os='a'])"/>
- 
- <screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --libdir=/lib \
--    --enable-write</userinput></screen>
-+    --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/util-linux.xml"
-@@ -43,14 +43,6 @@
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/util-linux.xml"
--    xpointer="xpointer(//*[@os='dummy1'])"/>
--
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/util-linux.xml"
--    xpointer="xpointer(//*[@os='dummy2'])"/>
--
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/util-linux.xml"
-     xpointer="xpointer(//*[@os='f'])"/>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-diff -ru /home/jp/a/BOOK/final-system/multilib/vim.xml BOOK/final-system/multilib/vim.xml
---- /home/jp/a/BOOK/final-system/multilib/vim.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/vim.xml	2014-10-03 20:44:43.924339262 +0200
-@@ -46,12 +46,7 @@
-     xpointer="xpointer(//*[@os='d'])"/>
- 
- <screen os="e"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
--  ./configure --prefix=/usr \
--    --enable-multibyte</userinput></screen>
--
--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
--    href="../common/vim.xml"
--    xpointer="xpointer(//*[@os='f'])"/>
-+  ./configure --prefix=/usr</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/vim.xml"
-diff -ru /home/jp/a/BOOK/cross-tools/common/ncurses.xml BOOK/cross-tools/common/ncurses.xml
---- /home/jp/a/BOOK/cross-tools/common/ncurses.xml	2014-05-11 16:24:52.642516678 +0200
-+++ BOOK/cross-tools/common/ncurses.xml	2014-10-03 20:44:43.904339261 +0200
-@@ -12,7 +12,7 @@
- 
-   <indexterm zone="ch-cross-tools-ncurses">
-     <primary sortas="a-Ncurses">Ncurses</primary>
--    <secondary>cross-tools</secondary>
-+    <secondary>cross tools</secondary>
-   </indexterm>
- 
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-@@ -22,6 +22,16 @@
-   <sect2 role="installation">
-     <title>Installation of Ncurses</title>
- 
-+    <para os="e1">When Ncurses is compiled, it executes <command>tic</command>
-+    to create a terminfo database in
-+    <filename class="directory">${prefix}/share/terminfo</filename>. If
-+    possible, the <filename>Makefile</filename> will use the
-+    <command>tic</command> binary that was just compiled in its
-+    source tree, but this does not work when Ncurses is cross-compiled. To
-+    allow the Ncurses build in <xref linkend="chapter-temp-system" /> to succeed, we
-+    will build and install a <command>tic</command> program that can be run on
-+    the host system.</para>
-+
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../temp-system/common/ncurses.xml"
-     xpointer="xpointer(//*[@os='p1'])"/>
-diff -ru /home/jp/a/BOOK/final-system/multilib/xz-64bit.xml BOOK/final-system/multilib/xz-64bit.xml
---- /home/jp/a/BOOK/final-system/multilib/xz-64bit.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/xz-64bit.xml	2014-10-03 20:44:43.924339262 +0200
-@@ -11,7 +11,7 @@
-   <title>XZ Utils-&xz-version; 64 Bit</title>
- 
-   <indexterm zone="ch-system-xz">
--    <primary sortas="a-XZ-Utils">XZ-Utils</primary>
-+    <primary sortas="a-XZ Utils">XZ Utils</primary>
-   </indexterm>
- 
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-@@ -19,13 +19,14 @@
-   xpointer="xpointer(//*[@role='package'])"/>
- 
-   <sect2 role="installation">
--    <title>Installation of XZ-Utils</title>
-+    <title>Installation of XZ Utils</title>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="xz.xml"
-     xpointer="xpointer(//*[@os='a'])"/>
- 
--<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
-+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-+    --libdir=/usr/lib64 --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="xz.xml"
-@@ -64,7 +65,7 @@
-     xpointer="xpointer(//*[@os='j'])"/>
- 
- <screen os="k"><userinput>mv -v /usr/lib64/liblzma.so.* /lib64
--ln -svf ../../lib64/liblzma.so.&xz-version; /usr/lib64/liblzma.so</userinput></screen>
-+ln -sfv ../../lib64/$(readlink /usr/lib64/liblzma.so) /usr/lib64/liblzma.so</userinput></screen>
- 
-   </sect2>
- 
-diff -ru /home/jp/a/BOOK/final-system/multilib/xz-n32.xml BOOK/final-system/multilib/xz-n32.xml
---- /home/jp/a/BOOK/final-system/multilib/xz-n32.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/xz-n32.xml	2014-10-03 20:44:43.924339262 +0200
-@@ -11,7 +11,7 @@
-   <title>XZ Utils-&xz-version; N32 Libraries</title>
- 
-   <indexterm zone="ch-system-xz-n32">
--    <primary sortas="a-XZ-Utils">XZ-Utils</primary>
-+    <primary sortas="a-XZ Utils">XZ Utils</primary>
-     <secondary>N32</secondary>
-   </indexterm>
- 
-@@ -26,7 +26,8 @@
-     href="xz.xml"
-     xpointer="xpointer(//*[@os='a'])"/>
- 
--<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
-+<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
-+    --libdir=/usr/lib32 --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="xz.xml"
-@@ -55,7 +56,7 @@
-     xpointer="xpointer(//*[@os='j'])"/>
- 
- <screen os="k"><userinput>mv -v /usr/lib32/liblzma.so.* /lib32
--ln -svf ../../lib32/liblzma.so.&xz-version; /usr/lib32/liblzma.so</userinput></screen>
-+ln -sfv ../../lib32/$(readlink /usr/lib32/liblzma.so) /usr/lib32/liblzma.so</userinput></screen>
- 
-   </sect2>
- 
-diff -ru /home/jp/a/BOOK/final-system/multilib/xz.xml BOOK/final-system/multilib/xz.xml
---- /home/jp/a/BOOK/final-system/multilib/xz.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/xz.xml	2014-10-03 20:44:43.924339262 +0200
-@@ -11,7 +11,7 @@
-   <title>XZ Utils-&xz-version; 32 Bit Libraries</title>
- 
-   <indexterm zone="ch-system-xz-32">
--    <primary sortas="a-XZ-Utils">XZ-Utils</primary>
-+    <primary sortas="a-XZ Utils">XZ Utils</primary>
-     <secondary>32 Bit</secondary>
-   </indexterm>
- 
-@@ -26,7 +26,8 @@
-     href="../common/xz.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/xz-&xz-version;</userinput></screen>
- 
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../common/xz.xml"
-diff -ru /home/jp/a/BOOK/final-system/multilib/zlib-64bit.xml BOOK/final-system/multilib/zlib-64bit.xml
---- /home/jp/a/BOOK/final-system/multilib/zlib-64bit.xml	2014-05-11 16:24:52.650516678 +0200
-+++ BOOK/final-system/multilib/zlib-64bit.xml	2014-10-03 20:44:43.924339262 +0200
-@@ -56,12 +56,20 @@
- 
-     <para os="h">The previous command installed two <filename
-     class="extension">.so</filename> files into <filename
--    class="directory">/usr/lib64</filename>. We will move it into
--    <filename class="directory">/lib64</filename> and then relink it
--    to <filename class="directory">/usr/lib64</filename>:</para>
-+    class="directory">/usr/lib64</filename>. We will move them into
-+    <filename class="directory">/lib64</filename> and then recreate a link
-+    in <filename class="directory">/usr/lib64</filename>:</para>
- 
- <screen os="i"><userinput>mv -v /usr/lib64/libz.so.* /lib64
--ln -svf ../../lib64/libz.so.1 /usr/lib64/libz.so</userinput></screen>
-+ln -sfv ../../lib64/$(readlink /usr/lib64/libz.so) /usr/lib64/libz.so</userinput></screen>
-+
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/zlib.xml"
-+    xpointer="xpointer(//*[@os='j'])"/>
-+
-+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-+    href="../common/zlib.xml"
-+    xpointer="xpointer(//*[@os='k'])"/>
- 
-   </sect2>
- 
 diff -ru /home/jp/a/BOOK/final-system/multilib/zlib-n32.xml BOOK/final-system/multilib/zlib-n32.xml
 --- /home/jp/a/BOOK/final-system/multilib/zlib-n32.xml	2014-05-11 16:24:52.650516678 +0200
 +++ BOOK/final-system/multilib/zlib-n32.xml	2014-10-03 20:44:43.924339262 +0200



More information about the lfs-traducfr mailing list