r6758 - in branches/cross-lfs/BOOK/final-system: mips64 multilib sparc64 x86_64

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Fri Aug 26 13:08:35 PDT 2005


Author: manuel
Date: 2005-08-26 14:08:33 -0600 (Fri, 26 Aug 2005)
New Revision: 6758

Modified:
   branches/cross-lfs/BOOK/final-system/mips64/glibc-64bit.xml
   branches/cross-lfs/BOOK/final-system/mips64/glibc-n32.xml
   branches/cross-lfs/BOOK/final-system/multilib/bzip2-64bit.xml
   branches/cross-lfs/BOOK/final-system/multilib/bzip2-n32.xml
   branches/cross-lfs/BOOK/final-system/multilib/e2fsprogs-64bit.xml
   branches/cross-lfs/BOOK/final-system/multilib/e2fsprogs-n32.xml
   branches/cross-lfs/BOOK/final-system/multilib/flex-64bit.xml
   branches/cross-lfs/BOOK/final-system/multilib/flex-n32.xml
   branches/cross-lfs/BOOK/final-system/multilib/libtool-64bit.xml
   branches/cross-lfs/BOOK/final-system/multilib/libtool-n32.xml
   branches/cross-lfs/BOOK/final-system/multilib/ncurses-64bit.xml
   branches/cross-lfs/BOOK/final-system/multilib/ncurses-n32.xml
   branches/cross-lfs/BOOK/final-system/multilib/perl-64bit.xml
   branches/cross-lfs/BOOK/final-system/multilib/perl-n32.xml
   branches/cross-lfs/BOOK/final-system/multilib/readline-64bit.xml
   branches/cross-lfs/BOOK/final-system/multilib/readline-n32.xml
   branches/cross-lfs/BOOK/final-system/multilib/shadow-64bit.xml
   branches/cross-lfs/BOOK/final-system/multilib/shadow-n32.xml
   branches/cross-lfs/BOOK/final-system/multilib/zlib-64bit.xml
   branches/cross-lfs/BOOK/final-system/multilib/zlib-n32.xml
   branches/cross-lfs/BOOK/final-system/sparc64/glibc-64bit.xml
   branches/cross-lfs/BOOK/final-system/x86_64/glibc-64bit.xml
Log:
Xinclude fixes on multilib builds.

Modified: branches/cross-lfs/BOOK/final-system/mips64/glibc-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/mips64/glibc-64bit.xml	2005-08-26 19:26:29 UTC (rev 6757)
+++ branches/cross-lfs/BOOK/final-system/mips64/glibc-64bit.xml	2005-08-26 20:08:33 UTC (rev 6758)
@@ -47,39 +47,39 @@
     xpointer="xpointer(//*[@os='z'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='ba'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='bb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='bc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='bd'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
    <para>Now we make sure the Glibc goes into <filename
@@ -88,7 +88,7 @@
 <screen><userinput>echo "slibdir=/lib64" >> configparms</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
 <screen><userinput>CC="gcc ${BUILD64}" CXX="gcc ${BUILD64}" \
@@ -111,31 +111,31 @@
     </variablelist>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='k'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='l'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='m'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='n'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='s'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='t'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: branches/cross-lfs/BOOK/final-system/mips64/glibc-n32.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/mips64/glibc-n32.xml	2005-08-26 19:26:29 UTC (rev 6757)
+++ branches/cross-lfs/BOOK/final-system/mips64/glibc-n32.xml	2005-08-26 20:08:33 UTC (rev 6758)
@@ -43,39 +43,39 @@
     <title>Installation of Glibc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='ba'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='bb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='bc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='bd'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
    <para>Now we make sure the Glibc goes into <filename
@@ -84,7 +84,7 @@
 <screen><userinput>echo "slibdir=/lib32" >> configparms</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
 <screen><userinput>CC="gcc ${BUILDN32}" CXX="gcc ${BUILDN32} \
@@ -107,31 +107,31 @@
     </variablelist>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='k'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='l'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='m'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='n'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='s'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='t'])"/>
 
   </sect2>

Modified: branches/cross-lfs/BOOK/final-system/multilib/bzip2-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/bzip2-64bit.xml	2005-08-26 19:26:29 UTC (rev 6757)
+++ branches/cross-lfs/BOOK/final-system/multilib/bzip2-64bit.xml	2005-08-26 20:08:33 UTC (rev 6758)
@@ -51,11 +51,11 @@
     xpointer="xpointer(//*[@os='k'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
+    href="bzip2.xml"
     xpointer="xpointer(//*[@os='l'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
+    href="bzip2.xml"
     xpointer="xpointer(//*[@os='m'])"/>
 
     <para os="ba">We need to remove the tests since they won't work on
@@ -66,14 +66,14 @@
     -e 's@/lib\(/\| \|$\)@/lib64\1 at g' Makefile</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
+    href="bzip2.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>make -f Makefile-libbz2_so CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}"
 make clean</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
+    href="bzip2.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>make CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}"</userinput></screen>
@@ -84,15 +84,15 @@
 <screen><userinput>rm -f /usr/bin/bz* /bin/bz*</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
+    href="bzip2.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
+    href="bzip2.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
+    href="bzip2.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
 <screen><userinput>cp bzip2-shared /bin/bzip2

Modified: branches/cross-lfs/BOOK/final-system/multilib/bzip2-n32.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/bzip2-n32.xml	2005-08-26 19:26:29 UTC (rev 6757)
+++ branches/cross-lfs/BOOK/final-system/multilib/bzip2-n32.xml	2005-08-26 20:08:33 UTC (rev 6758)
@@ -43,11 +43,11 @@
     <title>Installation of Bzip2</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
+    href="bzip2.xml"
     xpointer="xpointer(//*[@os='l'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
+    href="bzip2.xml"
     xpointer="xpointer(//*[@os='m'])"/>
 
     <para>We need to remove the tests since they won't work on
@@ -58,14 +58,14 @@
     -e 's@/lib\(/\| \|$\)@/lib32\1 at g' Makefile</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
+    href="bzip2.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>make -f Makefile-libbz2_so CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}"
 make clean</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
+    href="bzip2.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>make CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}"</userinput></screen>
@@ -76,15 +76,15 @@
 <screen><userinput>rm -f /usr/bin/bz* /bin/bz*</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
+    href="bzip2.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
+    href="bzip2.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
+    href="bzip2.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
 <screen><userinput>cp bzip2-shared /bin/bzip2

Modified: branches/cross-lfs/BOOK/final-system/multilib/e2fsprogs-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/e2fsprogs-64bit.xml	2005-08-26 19:26:29 UTC (rev 6757)
+++ branches/cross-lfs/BOOK/final-system/multilib/e2fsprogs-64bit.xml	2005-08-26 20:08:33 UTC (rev 6758)
@@ -48,22 +48,22 @@
 <screen><userinput>sed -i '/libdir=.*\/lib/s@/lib@/lib64 at g' configure</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
+    href="e2fsprogs.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
+    href="e2fsprogs.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
+    href="e2fsprogs.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>CC="gcc ${BUILD64}" ../configure --prefix=/usr \
     --with-root-prefix="" --enable-elf-shlibs --disable-evms</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
+    href="e2fsprogs.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -85,11 +85,11 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
+    href="e2fsprogs.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
+    href="e2fsprogs.xml"
     xpointer="xpointer(//*[@os='k'])"/>
 
   </sect2>

Modified: branches/cross-lfs/BOOK/final-system/multilib/e2fsprogs-n32.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/e2fsprogs-n32.xml	2005-08-26 19:26:29 UTC (rev 6757)
+++ branches/cross-lfs/BOOK/final-system/multilib/e2fsprogs-n32.xml	2005-08-26 20:08:33 UTC (rev 6758)
@@ -48,22 +48,22 @@
 <screen><userinput>sed -i '/libdir=.*\/lib/s@/lib@/lib32 at g' configure</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
+    href="e2fsprogs.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
+    href="e2fsprogs.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
+    href="e2fsprogs.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>CC="gcc ${BUILDN32}" ../configure --prefix=/usr \
     --with-root-prefix="" --enable-elf-shlibs --disable-evms</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
+    href="e2fsprogs.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <para>Compile the libraries:</para>
@@ -71,11 +71,11 @@
 <screen><userinput>make CC="gcc ${BUILDN32}" libs</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
+    href="e2fsprogs.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
+    href="e2fsprogs.xml"
     xpointer="xpointer(//*[@os='k'])"/>
 
   </sect2>

Modified: branches/cross-lfs/BOOK/final-system/multilib/flex-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/flex-64bit.xml	2005-08-26 19:26:29 UTC (rev 6757)
+++ branches/cross-lfs/BOOK/final-system/multilib/flex-64bit.xml	2005-08-26 20:08:33 UTC (rev 6758)
@@ -43,30 +43,30 @@
     <title>Installation of Flex</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
+    href="flex.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
+    href="flex.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
+    href="flex.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
+    href="flex.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
+    href="flex.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
     --libdir=/usr/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
+    href="flex.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -74,15 +74,15 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
+    href="flex.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
+    href="flex.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
+    href="flex.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
     <para>There are some packages that expect to find the

Modified: branches/cross-lfs/BOOK/final-system/multilib/flex-n32.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/flex-n32.xml	2005-08-26 19:26:29 UTC (rev 6757)
+++ branches/cross-lfs/BOOK/final-system/multilib/flex-n32.xml	2005-08-26 20:08:33 UTC (rev 6758)
@@ -43,44 +43,44 @@
     <title>Installation of Flex</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
+    href="flex.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
+    href="flex.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
+    href="flex.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
+    href="flex.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
+    href="flex.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
 <screen><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
    --libdir=/usr/lib32</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
+    href="flex.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
 <screen><userinput>make libfl.a</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
+    href="flex.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
+    href="flex.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
+    href="flex.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
     <para>There are some packages that expect to find the

Modified: branches/cross-lfs/BOOK/final-system/multilib/libtool-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/libtool-64bit.xml	2005-08-26 19:26:29 UTC (rev 6757)
+++ branches/cross-lfs/BOOK/final-system/multilib/libtool-64bit.xml	2005-08-26 20:08:33 UTC (rev 6758)
@@ -43,30 +43,30 @@
     <title>Installation of Libtool</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
+    href="libtool.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
    --libdir=/usr/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
+    href="libtool.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
+    href="libtool.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
+    href="libtool.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
+    href="libtool.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
+    href="libtool.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: branches/cross-lfs/BOOK/final-system/multilib/libtool-n32.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/libtool-n32.xml	2005-08-26 19:26:29 UTC (rev 6757)
+++ branches/cross-lfs/BOOK/final-system/multilib/libtool-n32.xml	2005-08-26 20:08:33 UTC (rev 6758)
@@ -43,30 +43,30 @@
     <title>Installation of Libtool</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
+    href="libtool.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
    --libdir=/usr/lib32</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
+    href="libtool.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
+    href="libtool.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
+    href="libtool.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
+    href="libtool.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
+    href="libtool.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
   </sect2>

Modified: branches/cross-lfs/BOOK/final-system/multilib/ncurses-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/ncurses-64bit.xml	2005-08-26 19:26:29 UTC (rev 6757)
+++ branches/cross-lfs/BOOK/final-system/multilib/ncurses-64bit.xml	2005-08-26 20:08:33 UTC (rev 6758)
@@ -43,7 +43,7 @@
     <title>Installation of Ncurses</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
+    href="ncurses.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
@@ -51,27 +51,27 @@
    --with-shared --without-debug</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
+    href="ncurses.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
+    href="ncurses.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
+    href="ncurses.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
+    href="ncurses.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
+    href="ncurses.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
+    href="ncurses.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
 <screen><userinput>mv /lib64/lib{panel,menu,form,ncurses,ncurses++}.a /usr/lib64</userinput></screen>
@@ -85,7 +85,7 @@
 ln -sf ../../lib64/libform.so.5 /usr/lib64/libform.so</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
+    href="ncurses.xml"
     xpointer="xpointer(//*[@os='k'])"/>
 
 <screen><userinput>chmod 755 /lib64/lib{panel,menu,form,ncurses}.so.&ncurses-version;</userinput></screen>

Modified: branches/cross-lfs/BOOK/final-system/multilib/ncurses-n32.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/ncurses-n32.xml	2005-08-26 19:26:29 UTC (rev 6757)
+++ branches/cross-lfs/BOOK/final-system/multilib/ncurses-n32.xml	2005-08-26 20:08:33 UTC (rev 6758)
@@ -43,7 +43,7 @@
     <title>Installation of Ncurses</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
+    href="ncurses.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
@@ -51,27 +51,27 @@
    --with-shared --without-debug</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
+    href="ncurses.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
+    href="ncurses.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
+    href="ncurses.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
+    href="ncurses.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
+    href="ncurses.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
+    href="ncurses.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
 <screen><userinput>mv /lib32/lib{panel,menu,form,ncurses,ncurses++}.a /usr/lib32</userinput></screen>
@@ -85,7 +85,7 @@
 ln -sf ../../lib32/libform.so.5 /usr/lib32/libform.so</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
+    href="ncurses.xml"
     xpointer="xpointer(//*[@os='k'])"/>
 
 <screen><userinput>chmod 755 /lib32/lib{panel,menu,form,ncurses}.so.&ncurses-version;</userinput></screen>

Modified: branches/cross-lfs/BOOK/final-system/multilib/perl-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/perl-64bit.xml	2005-08-26 19:26:29 UTC (rev 6757)
+++ branches/cross-lfs/BOOK/final-system/multilib/perl-64bit.xml	2005-08-26 20:08:33 UTC (rev 6758)
@@ -48,34 +48,34 @@
 <screen><userinput>sed -i 's@\${prefix}/lib@\${prefix}/lib64 at g' hints/linux.sh</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
+    href="perl.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>./configure.gnu --prefix=/usr -Dpager="/bin/less -isR" \
    -Dcc="gcc ${BUILD64}"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
+    href="perl.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
+    href="perl.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
+    href="perl.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
+    href="perl.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
+    href="perl.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
+    href="perl.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
   </sect2>

Modified: branches/cross-lfs/BOOK/final-system/multilib/perl-n32.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/perl-n32.xml	2005-08-26 19:26:29 UTC (rev 6757)
+++ branches/cross-lfs/BOOK/final-system/multilib/perl-n32.xml	2005-08-26 20:08:33 UTC (rev 6758)
@@ -48,34 +48,34 @@
 <screen><userinput>sed -i 's@\${prefix}/lib@\${prefix}/lib32 at g' hints/linux.sh</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
+    href="perl.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>./configure.gnu --prefix=/usr -Dpager="/bin/less -isR" \
    -Dcc="gcc ${BUILDN32}"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
+    href="perl.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
+    href="perl.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
+    href="perl.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
+    href="perl.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
+    href="perl.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
+    href="perl.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
   </sect2>

Modified: branches/cross-lfs/BOOK/final-system/multilib/readline-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/readline-64bit.xml	2005-08-26 19:26:29 UTC (rev 6757)
+++ branches/cross-lfs/BOOK/final-system/multilib/readline-64bit.xml	2005-08-26 20:08:33 UTC (rev 6758)
@@ -43,44 +43,44 @@
     <title>Installation of Readline</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
+    href="readline.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
+    href="readline.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
+    href="readline.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
    ./configure --prefix=/usr --libdir=/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
+    href="readline.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
+    href="readline.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
+    href="readline.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
+    href="readline.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
+    href="readline.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
 <screen><userinput>chmod 755 /lib64/lib{readline,history}.so*</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
+    href="readline.xml"
     xpointer="xpointer(//*[@os='k'])"/>
 
 <screen><userinput>mv /lib64/lib{readline,history}.a /usr/lib64</userinput></screen>

Modified: branches/cross-lfs/BOOK/final-system/multilib/readline-n32.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/readline-n32.xml	2005-08-26 19:26:29 UTC (rev 6757)
+++ branches/cross-lfs/BOOK/final-system/multilib/readline-n32.xml	2005-08-26 20:08:33 UTC (rev 6758)
@@ -43,44 +43,44 @@
     <title>Installation of Readline</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
+    href="readline.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
+    href="readline.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
+    href="readline.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
    ./configure --prefix=/usr --libdir=/lib32</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
+    href="readline.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
+    href="readline.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
+    href="readline.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
+    href="readline.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
+    href="readline.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
 <screen><userinput>chmod 755 /lib32/lib{readline,history}.so*</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
+    href="readline.xml"
     xpointer="xpointer(//*[@os='k'])"/>
 
 <screen><userinput>mv /lib32/lib{readline,history}.a /usr/lib32</userinput></screen>

Modified: branches/cross-lfs/BOOK/final-system/multilib/shadow-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/shadow-64bit.xml	2005-08-26 19:26:29 UTC (rev 6757)
+++ branches/cross-lfs/BOOK/final-system/multilib/shadow-64bit.xml	2005-08-26 20:08:33 UTC (rev 6758)
@@ -43,38 +43,38 @@
     <title>Installation of Shadow</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
 <screen><userinput>CC="gcc ${BUILD64}" ./configure --libdir=/lib64 \
    --enable-shared</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -110,15 +110,15 @@
     xpointer="xpointer(//*[@os='q'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='r'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='s'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='t'])"/>
 
 <screen><userinput>mv /lib64/libshadow.*a /usr/lib64

Modified: branches/cross-lfs/BOOK/final-system/multilib/shadow-n32.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/shadow-n32.xml	2005-08-26 19:26:29 UTC (rev 6757)
+++ branches/cross-lfs/BOOK/final-system/multilib/shadow-n32.xml	2005-08-26 20:08:33 UTC (rev 6758)
@@ -43,50 +43,50 @@
     <title>Installation of Shadow</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
 <screen><userinput>CC="gcc ${BUILDN32}" ./configure --libdir=/lib32 \
    --enable-shared</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='r'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='s'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='t'])"/>
 
 <screen><userinput>mv /lib32/libshadow.*a /usr/lib32

Modified: branches/cross-lfs/BOOK/final-system/multilib/zlib-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/zlib-64bit.xml	2005-08-26 19:26:29 UTC (rev 6757)
+++ branches/cross-lfs/BOOK/final-system/multilib/zlib-64bit.xml	2005-08-26 20:08:33 UTC (rev 6758)
@@ -43,34 +43,34 @@
     <title>Installation of Zlib</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
 <screen><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" ./configure --prefix=/usr \
    --shared --libdir=/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <para>The previous command installed a <filename
@@ -82,7 +82,7 @@
 ln -sf ../../lib64/libz.so.&zlib-version; /usr/lib64/libz.so</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
 <screen><userinput>make clean
@@ -91,19 +91,19 @@
 make</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='k'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='l'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='m'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='n'])"/>
 
 <screen><userinput>chmod 644 /usr/lib64/libz.a</userinput></screen>

Modified: branches/cross-lfs/BOOK/final-system/multilib/zlib-n32.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/zlib-n32.xml	2005-08-26 19:26:29 UTC (rev 6757)
+++ branches/cross-lfs/BOOK/final-system/multilib/zlib-n32.xml	2005-08-26 20:08:33 UTC (rev 6758)
@@ -43,34 +43,34 @@
     <title>Installation of Zlib</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
 <screen><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" ./configure --prefix=/usr \
    --shared --libdir=/lib32</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <para>The previous command installed a <filename
@@ -82,7 +82,7 @@
 ln -sf ../../lib32/libz.so.&zlib-version; /usr/lib32/libz.so</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
 <screen><userinput>make clean
@@ -91,19 +91,19 @@
 make</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='k'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='l'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='m'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='n'])"/>
 
 <screen><userinput>chmod 644 /usr/lib32/libz.a</userinput></screen>

Modified: branches/cross-lfs/BOOK/final-system/sparc64/glibc-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/sparc64/glibc-64bit.xml	2005-08-26 19:26:29 UTC (rev 6757)
+++ branches/cross-lfs/BOOK/final-system/sparc64/glibc-64bit.xml	2005-08-26 20:08:33 UTC (rev 6758)
@@ -47,31 +47,31 @@
     xpointer="xpointer(//*[@os='z'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='ba'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='bd'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <para>Now we make sure the Glibc goes into <filename
@@ -80,7 +80,7 @@
 <screen><userinput>echo "slibdir=/lib64" >> configparms</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
 <screen><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
@@ -103,31 +103,31 @@
     </variablelist>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='k'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='l'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='m'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='n'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='s'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='t'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: branches/cross-lfs/BOOK/final-system/x86_64/glibc-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/x86_64/glibc-64bit.xml	2005-08-26 19:26:29 UTC (rev 6757)
+++ branches/cross-lfs/BOOK/final-system/x86_64/glibc-64bit.xml	2005-08-26 20:08:33 UTC (rev 6758)
@@ -48,27 +48,27 @@
     xpointer="xpointer(//*[@os='z'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <para>Now we make sure the Glibc goes into
@@ -100,31 +100,31 @@
     </variablelist>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='k'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='l'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='m'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='n'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='s'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/glibc.xml"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='t'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"




More information about the lfs-book mailing list