Index: BOOK/cross-tools/arm/gcc-final.xml
===================================================================
--- BOOK/cross-tools/arm/gcc-final.xml	(revision 5f18bea5160cb42f02973797164d6a0de3f9d803)
+++ BOOK/cross-tools/arm/gcc-final.xml	(revision 94e2400b14723db3ffce07d61cc239d76a4f4322)
@@ -62,5 +62,5 @@
   --target=${CLFS_TARGET} \
   --host=${CLFS_HOST} \
-  --with-sysroot=${CLFS}/cross-tools/sysroot \
+  --with-sysroot=${CLFS}/cross-tools/${CLFS_TARGET} \
   --disable-nls \
   --enable-languages=c \
Index: BOOK/cross-tools/arm/gcc-static.xml
===================================================================
--- BOOK/cross-tools/arm/gcc-static.xml	(revision 5f18bea5160cb42f02973797164d6a0de3f9d803)
+++ BOOK/cross-tools/arm/gcc-static.xml	(revision 94e2400b14723db3ffce07d61cc239d76a4f4322)
@@ -61,5 +61,5 @@
   --host=${CLFS_HOST} \
   --target=${CLFS_TARGET} \
-  --with-sysroot=${CLFS}/cross-tools/sysroot \
+  --with-sysroot=${CLFS}/cross-tools/${CLFS_TARGET} \
   --disable-nls \
   --disable-shared \
Index: BOOK/cross-tools/common/binutils.xml
===================================================================
--- BOOK/cross-tools/common/binutils.xml	(revision 5f18bea5160cb42f02973797164d6a0de3f9d803)
+++ BOOK/cross-tools/common/binutils.xml	(revision 94e2400b14723db3ffce07d61cc239d76a4f4322)
@@ -47,5 +47,5 @@
    --prefix=${CLFS}/cross-tools \
    --target=${CLFS_TARGET} \
-   --with-sysroot=${CLFS}/cross-tools/sysroot \
+   --with-sysroot=${CLFS}/cross-tools/${CLFS_TARGET} \
    --disable-nls \
    --disable-multilib</userinput></screen>
@@ -73,5 +73,5 @@
 
       <varlistentry os="f4">
-        <term><parameter>--with-sysroot=${CLFS}/cross-tools/sysroot</parameter></term>
+        <term><parameter>--with-sysroot=${CLFS}/cross-tools/${CLFS_TARGET}</parameter></term>
         <listitem>
           <para>This tells configure that ${CLFS} is going to be the root
Index: BOOK/cross-tools/common/gcc-final.xml
===================================================================
--- BOOK/cross-tools/common/gcc-final.xml	(revision 5f18bea5160cb42f02973797164d6a0de3f9d803)
+++ BOOK/cross-tools/common/gcc-final.xml	(revision 94e2400b14723db3ffce07d61cc239d76a4f4322)
@@ -64,5 +64,5 @@
   --target=${CLFS_TARGET} \
   --host=${CLFS_HOST} \
-  --with-sysroot=${CLFS}/cross-tools/sysroot \
+  --with-sysroot=${CLFS}/cross-tools/${CLFS_TARGET} \
   --disable-nls \
   --enable-languages=c \
Index: BOOK/cross-tools/common/gcc-static.xml
===================================================================
--- BOOK/cross-tools/common/gcc-static.xml	(revision 5f18bea5160cb42f02973797164d6a0de3f9d803)
+++ BOOK/cross-tools/common/gcc-static.xml	(revision 94e2400b14723db3ffce07d61cc239d76a4f4322)
@@ -60,5 +60,5 @@
   --host=${CLFS_HOST} \
   --target=${CLFS_TARGET} \
-  --with-sysroot=${CLFS}/cross-tools/sysroot \
+  --with-sysroot=${CLFS}/cross-tools/${CLFS_TARGET} \
   --disable-nls  \
   --disable-shared \
@@ -118,7 +118,7 @@
 
       <varlistentry os="af5">
-        <term><parameter>--with-sysroot=${CLFS}/cross-tools/sysroot</parameter></term>
-        <listitem>
-          <para>This tells configure that ${CLFS}/cross-tools/sysroot is going
+        <term><parameter>--with-sysroot=${CLFS}/cross-tools/${CLFS_TARGET}</parameter></term>
+        <listitem>
+          <para>This tells configure that ${CLFS}/cross-tools/${CLFS_TARGET} is going
           to be the temporary root of our system. It will now use the specified
           sysroot as a prefix of the default search paths.</para>
Index: BOOK/cross-tools/common/linux-headers.xml
===================================================================
--- BOOK/cross-tools/common/linux-headers.xml	(revision 5f18bea5160cb42f02973797164d6a0de3f9d803)
+++ BOOK/cross-tools/common/linux-headers.xml	(revision 94e2400b14723db3ffce07d61cc239d76a4f4322)
@@ -32,5 +32,5 @@
 <screen os="c"><userinput>make mrproper
 make ARCH=${CLFS_ARCH} headers_check
-make ARCH=${CLFS_ARCH} INSTALL_HDR_PATH=${CLFS}/cross-tools/sysroot headers_install</userinput></screen>
+make ARCH=${CLFS_ARCH} INSTALL_HDR_PATH=${CLFS}/cross-tools/${CLFS_TARGET} headers_install</userinput></screen>
 
   </sect2>
@@ -43,5 +43,5 @@
 
       <seglistitem>
-        <seg>${CLFS}/cross-tools/sysroot/include/{asm,asm-generic,drm,linux,mtd,rdma,scsi,sound,video,xen}/*.h</seg>
+        <seg>${CLFS}/cross-tools/${CLFS_TARGET}/include/{asm,asm-generic,drm,linux,mtd,rdma,scsi,sound,video,xen}/*.h</seg>
       </seglistitem>
     </segmentedlist>
@@ -53,10 +53,10 @@
 
       <varlistentry id="linux-headers">
-        <term><filename class="headerfile">${CLFS}/cross-tools/sysroot/include/{asm,asm-generic,drm,linux,mtd,rdma,scsi,sound,video,xen}/*.h</filename></term>
+        <term><filename class="headerfile">${CLFS}/cross-tools/${CLFS_TARGET}/include/{asm,asm-generic,drm,linux,mtd,rdma,scsi,sound,video,xen}/*.h</filename></term>
         <listitem>
           <para>The Linux API headers</para>
           <indexterm zone="ch-cross-tools-linux-headers linux-headers">
             <primary
-            sortas="e-${CLFS}/cross-tools/sysroot/include/{asm,linux}/*.h">/usr/include/{asm,linux}/*.h</primary>
+            sortas="e-${CLFS}/cross-tools/${CLFS_TARGET}/include/{asm,linux}/*.h">/usr/include/{asm,linux}/*.h</primary>
           </indexterm>
         </listitem>
Index: BOOK/cross-tools/mips/gcc-final.xml
===================================================================
--- BOOK/cross-tools/mips/gcc-final.xml	(revision 5f18bea5160cb42f02973797164d6a0de3f9d803)
+++ BOOK/cross-tools/mips/gcc-final.xml	(revision 94e2400b14723db3ffce07d61cc239d76a4f4322)
@@ -62,5 +62,5 @@
   --target=${CLFS_TARGET} \
   --host=${CLFS_HOST} \
-  --with-sysroot=${CLFS}/cross-tools/sysroot \
+  --with-sysroot=${CLFS}/cross-tools/${CLFS_TARGET} \
   --disable-nls \
   --enable-languages=c \
Index: BOOK/cross-tools/mips/gcc-static.xml
===================================================================
--- BOOK/cross-tools/mips/gcc-static.xml	(revision 5f18bea5160cb42f02973797164d6a0de3f9d803)
+++ BOOK/cross-tools/mips/gcc-static.xml	(revision 94e2400b14723db3ffce07d61cc239d76a4f4322)
@@ -61,5 +61,5 @@
   --host=${CLFS_HOST} \
   --target=${CLFS_TARGET} \
-  --with-sysroot=${CLFS}/cross-tools/sysroot \
+  --with-sysroot=${CLFS}/cross-tools/${CLFS_TARGET} \
   --disable-nls  \
   --disable-shared \
Index: BOOK/cross-tools/x86/gcc-final.xml
===================================================================
--- BOOK/cross-tools/x86/gcc-final.xml	(revision 5f18bea5160cb42f02973797164d6a0de3f9d803)
+++ BOOK/cross-tools/x86/gcc-final.xml	(revision 94e2400b14723db3ffce07d61cc239d76a4f4322)
@@ -62,5 +62,5 @@
   --target=${CLFS_TARGET} \
   --host=${CLFS_HOST} \
-  --with-sysroot=${CLFS}/cross-tools/sysroot \
+  --with-sysroot=${CLFS}/cross-tools/${CLFS_TARGET} \
   --disable-nls \
   --enable-languages=c \
Index: BOOK/cross-tools/x86/gcc-static.xml
===================================================================
--- BOOK/cross-tools/x86/gcc-static.xml	(revision 5f18bea5160cb42f02973797164d6a0de3f9d803)
+++ BOOK/cross-tools/x86/gcc-static.xml	(revision 94e2400b14723db3ffce07d61cc239d76a4f4322)
@@ -61,5 +61,5 @@
   --host=${CLFS_HOST} \
   --target=${CLFS_TARGET} \
-  --with-sysroot=${CLFS}/cross-tools/sysroot \
+  --with-sysroot=${CLFS}/cross-tools/${CLFS_TARGET} \
   --disable-nls  \
   --disable-shared \
