r783 - in trunk/BOOK: . boot/common boot/multilib temp-system/64 temp-system/common temp-system/multilib

jim at linuxfromscratch.org jim at linuxfromscratch.org
Thu Dec 1 00:19:55 PST 2005


Author: jim
Date: 2005-12-01 01:19:53 -0700 (Thu, 01 Dec 2005)
New Revision: 783

Modified:
   trunk/BOOK/
   trunk/BOOK/boot/common/inetutils.xml
   trunk/BOOK/boot/common/udev.xml
   trunk/BOOK/boot/multilib/inetutils.xml
   trunk/BOOK/boot/multilib/udev.xml
   trunk/BOOK/temp-system/64/ncurses.xml
   trunk/BOOK/temp-system/64/zlib.xml
   trunk/BOOK/temp-system/common/bash.xml
   trunk/BOOK/temp-system/common/findutils.xml
   trunk/BOOK/temp-system/common/gzip.xml
   trunk/BOOK/temp-system/common/ncurses.xml
   trunk/BOOK/temp-system/common/tar.xml
   trunk/BOOK/temp-system/multilib/bash.xml
   trunk/BOOK/temp-system/multilib/findutils.xml
   trunk/BOOK/temp-system/multilib/gzip.xml
   trunk/BOOK/temp-system/multilib/ncurses-64bit.xml
   trunk/BOOK/temp-system/multilib/ncurses-n32.xml
   trunk/BOOK/temp-system/multilib/ncurses.xml
   trunk/BOOK/temp-system/multilib/tar.xml
Log:
 r845 at server:  jim | 2005-12-01 00:19:34 -0800
 Text update fixes



Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:843
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790
   + 3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:845
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790

Modified: trunk/BOOK/boot/common/inetutils.xml
===================================================================
--- trunk/BOOK/boot/common/inetutils.xml	2005-12-01 06:51:50 UTC (rev 782)
+++ trunk/BOOK/boot/common/inetutils.xml	2005-12-01 08:19:53 UTC (rev 783)
@@ -40,28 +40,30 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/inetutils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="aa"><userinput>./configure --prefix=/usr --libexecdir=/usr/sbin \
+<screen os="b"><userinput>./configure --prefix=/usr --libexecdir=/usr/sbin \
     --host=${LFS_TARGET} --sysconfdir=/etc --disable-logger \
     --disable-syslogd --disable-whois --disable-servers \
     --with-ncurses-include-dir=/tools/include/ncurses</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/inetutils.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/inetutils.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/inetutils.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen os="ab"><userinput>make</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/inetutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen os="ac"><userinput>make DESTDIR="${LFS}" install</userinput></screen>
+<screen os="g"><userinput>make DESTDIR="${LFS}" install</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/boot/common/udev.xml
===================================================================
--- trunk/BOOK/boot/common/udev.xml	2005-12-01 06:51:50 UTC (rev 782)
+++ trunk/BOOK/boot/common/udev.xml	2005-12-01 08:19:53 UTC (rev 783)
@@ -24,26 +24,26 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/udev.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="aa"><userinput>make CROSS="${LFS_TARGET}-" CC="${CC}" LD="${CC}" \
+<screen os="b"><userinput>make CROSS="${LFS_TARGET}-" CC="${CC}" LD="${CC}" \
     EXTRAS="extras/firmware extras/run_directory"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/udev.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/udev.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
-<screen os="ab"><userinput>make DESTDIR=${LFS} EXTRAS="extras/firmware extras/run_directory" install</userinput></screen>
+<screen os="f"><userinput>make DESTDIR=${LFS} EXTRAS="extras/firmware extras/run_directory" install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/udev.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen os="ac"><userinput>cp ../&udev-config-file; ${LFS}/etc/udev/rules.d/25-lfs.rules</userinput></screen>
+<screen os="i"><userinput>cp ../&udev-config-file; ${LFS}/etc/udev/rules.d/25-lfs.rules</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/boot/multilib/inetutils.xml
===================================================================
--- trunk/BOOK/boot/multilib/inetutils.xml	2005-12-01 06:51:50 UTC (rev 782)
+++ trunk/BOOK/boot/multilib/inetutils.xml	2005-12-01 08:19:53 UTC (rev 783)
@@ -40,9 +40,9 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="aa"><userinput>CC="${CC} ${BUILD64}" \
+<screen os="b"><userinput>CC="${CC} ${BUILD64}" \
    ./configure --prefix=/usr --libexecdir=/usr/sbin \
    --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET} \
    --sysconfdir=/etc --disable-logger --disable-syslogd \
@@ -51,6 +51,10 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/inetutils.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/inetutils.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -59,16 +63,12 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
+    xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/inetutils.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
   </sect2>
 
   <sect2 role="content">

Modified: trunk/BOOK/boot/multilib/udev.xml
===================================================================
--- trunk/BOOK/boot/multilib/udev.xml	2005-12-01 06:51:50 UTC (rev 782)
+++ trunk/BOOK/boot/multilib/udev.xml	2005-12-01 08:19:53 UTC (rev 783)
@@ -24,30 +24,30 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="aa"><userinput>make CROSS="${LFS_TARGET}-" CC="${CC} ${BUILD64}" LD="${CC} ${BUILD64}" \
+<screen os="b"><userinput>make CROSS="${LFS_TARGET}-" CC="${CC} ${BUILD64}" LD="${CC} ${BUILD64}" \
     EXTRAS="extras/firmware extras/run_directory"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
+    xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/temp-system/64/ncurses.xml
===================================================================
--- trunk/BOOK/temp-system/64/ncurses.xml	2005-12-01 06:51:50 UTC (rev 782)
+++ trunk/BOOK/temp-system/64/ncurses.xml	2005-12-01 08:19:53 UTC (rev 783)
@@ -26,30 +26,30 @@
     href="../common/ncurses.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="aa"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
+<screen os="b"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
    ./configure --prefix=/tools --with-shared \
    --host=${LFS_TARGET} --without-debug --without-ada \
    --enable-overwrite --with-build-cc=gcc</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
+    xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/temp-system/64/zlib.xml
===================================================================
--- trunk/BOOK/temp-system/64/zlib.xml	2005-12-01 06:51:50 UTC (rev 782)
+++ trunk/BOOK/temp-system/64/zlib.xml	2005-12-01 08:19:53 UTC (rev 783)
@@ -43,10 +43,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/temp-system/common/bash.xml
===================================================================
--- trunk/BOOK/temp-system/common/bash.xml	2005-12-01 06:51:50 UTC (rev 782)
+++ trunk/BOOK/temp-system/common/bash.xml	2005-12-01 08:19:53 UTC (rev 783)
@@ -39,7 +39,7 @@
     href="../../final-system/common/bash.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen os="ac"><userinput>./configure --prefix=/tools --with-curses \
+<screen os="h"><userinput>./configure --prefix=/tools --with-curses \
    --without-bash-malloc --host=${LFS_TARGET}</userinput></screen>
 
     <variablelist os="ad">
@@ -66,19 +66,19 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/bash.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
+    xpointer="xpointer(//*[@os='j'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/bash.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
+    xpointer="xpointer(//*[@os='k'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/bash.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
+    xpointer="xpointer(//*[@os='m'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/bash.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
+    xpointer="xpointer(//*[@os='n'])"/>
 
     <para os="ae">Make a link for the programs that use <command>sh</command> for
     a shell:</para>

Modified: trunk/BOOK/temp-system/common/findutils.xml
===================================================================
--- trunk/BOOK/temp-system/common/findutils.xml	2005-12-01 06:51:50 UTC (rev 782)
+++ trunk/BOOK/temp-system/common/findutils.xml	2005-12-01 08:19:53 UTC (rev 783)
@@ -36,19 +36,19 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/findutils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/findutils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/findutils.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/findutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/temp-system/common/gzip.xml
===================================================================
--- trunk/BOOK/temp-system/common/gzip.xml	2005-12-01 06:51:50 UTC (rev 782)
+++ trunk/BOOK/temp-system/common/gzip.xml	2005-12-01 08:19:53 UTC (rev 783)
@@ -37,6 +37,10 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/gzip.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gzip.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/temp-system/common/ncurses.xml
===================================================================
--- trunk/BOOK/temp-system/common/ncurses.xml	2005-12-01 06:51:50 UTC (rev 782)
+++ trunk/BOOK/temp-system/common/ncurses.xml	2005-12-01 08:19:53 UTC (rev 783)
@@ -26,11 +26,11 @@
     href="../../final-system/common/ncurses.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="aa"><userinput>./configure --prefix=/tools --with-shared \
+<screen os="b"><userinput>./configure --prefix=/tools --with-shared \
    --host=${LFS_TARGET} --without-debug --without-ada \
    --enable-overwrite --with-build-cc=gcc</userinput></screen>
 
-    <variablelist os="ac">
+    <variablelist os="c">
       <title>The meaning of the configure options:</title>
 
       <varlistentry>
@@ -78,19 +78,19 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/ncurses.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/ncurses.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/ncurses.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
+    xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/ncurses.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/temp-system/common/tar.xml
===================================================================
--- trunk/BOOK/temp-system/common/tar.xml	2005-12-01 06:51:50 UTC (rev 782)
+++ trunk/BOOK/temp-system/common/tar.xml	2005-12-01 08:19:53 UTC (rev 783)
@@ -29,18 +29,18 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/tar.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="ac"><userinput>./configure --prefix=/tools \
+<screen os="b"><userinput>./configure --prefix=/tools \
    --host=${LFS_TARGET} --cache-file=config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/tar.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/tar.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/tar.xml"

Modified: trunk/BOOK/temp-system/multilib/bash.xml
===================================================================
--- trunk/BOOK/temp-system/multilib/bash.xml	2005-12-01 06:51:50 UTC (rev 782)
+++ trunk/BOOK/temp-system/multilib/bash.xml	2005-12-01 08:19:53 UTC (rev 783)
@@ -42,7 +42,7 @@
     href="../common/bash.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen os="ac"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
+<screen os="h"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
    ./configure --prefix=/tools --with-curses \
    --without-bash-malloc --host=${LFS_TARGET}</userinput></screen>
 
@@ -52,19 +52,19 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
+    xpointer="xpointer(//*[@os='j'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
+    xpointer="xpointer(//*[@os='k'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
+    xpointer="xpointer(//*[@os='m'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
+    xpointer="xpointer(//*[@os='n'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"

Modified: trunk/BOOK/temp-system/multilib/findutils.xml
===================================================================
--- trunk/BOOK/temp-system/multilib/findutils.xml	2005-12-01 06:51:50 UTC (rev 782)
+++ trunk/BOOK/temp-system/multilib/findutils.xml	2005-12-01 08:19:53 UTC (rev 783)
@@ -39,19 +39,19 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/temp-system/multilib/gzip.xml
===================================================================
--- trunk/BOOK/temp-system/multilib/gzip.xml	2005-12-01 06:51:50 UTC (rev 782)
+++ trunk/BOOK/temp-system/multilib/gzip.xml	2005-12-01 08:19:53 UTC (rev 783)
@@ -39,6 +39,10 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gzip.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gzip.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/temp-system/multilib/ncurses-64bit.xml
===================================================================
--- trunk/BOOK/temp-system/multilib/ncurses-64bit.xml	2005-12-01 06:51:50 UTC (rev 782)
+++ trunk/BOOK/temp-system/multilib/ncurses-64bit.xml	2005-12-01 08:19:53 UTC (rev 783)
@@ -26,26 +26,26 @@
     href="../common/ncurses.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="aa"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
+<screen os="b"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
    ./configure --prefix=/tools --with-shared \
    --host=${LFS_TARGET} --without-debug --without-ada \
    --enable-overwrite --with-build-cc=gcc --libdir=/tools/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
+    xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/temp-system/multilib/ncurses-n32.xml
===================================================================
--- trunk/BOOK/temp-system/multilib/ncurses-n32.xml	2005-12-01 06:51:50 UTC (rev 782)
+++ trunk/BOOK/temp-system/multilib/ncurses-n32.xml	2005-12-01 08:19:53 UTC (rev 783)
@@ -26,26 +26,26 @@
     href="ncurses.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="aa"><userinput>CC="${CC} ${BUILDN32}" CXX="${CXX} ${BUILDN32}" \
+<screen os="b"><userinput>CC="${CC} ${BUILDN32}" CXX="${CXX} ${BUILDN32}" \
    ./configure --prefix=/tools --with-shared \
    --host=${LFS_TARGET} --without-debug --without-ada \
    --enable-overwrite --with-build-cc=gcc --libdir=/tools/lib32</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="ncurses.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="ncurses.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="ncurses.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
+    xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="ncurses.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/temp-system/multilib/ncurses.xml
===================================================================
--- trunk/BOOK/temp-system/multilib/ncurses.xml	2005-12-01 06:51:50 UTC (rev 782)
+++ trunk/BOOK/temp-system/multilib/ncurses.xml	2005-12-01 08:19:53 UTC (rev 783)
@@ -26,30 +26,30 @@
     href="../common/ncurses.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="aa"><userinput>CC="${CC} ${BUILD32}" CXX="${CXX} ${BUILD32}" \
+<screen os="b"><userinput>CC="${CC} ${BUILD32}" CXX="${CXX} ${BUILD32}" \
    ./configure --prefix=/tools --with-shared \
    --host=${LFS_TARGET} --without-debug --without-ada \
    --enable-overwrite --with-build-cc=gcc</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
+    xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/temp-system/multilib/tar.xml
===================================================================
--- trunk/BOOK/temp-system/multilib/tar.xml	2005-12-01 06:51:50 UTC (rev 782)
+++ trunk/BOOK/temp-system/multilib/tar.xml	2005-12-01 08:19:53 UTC (rev 783)
@@ -32,18 +32,18 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="ac"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
    --host=${LFS_TARGET} --cache-file=config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tar.xml"




More information about the cross-lfs mailing list