r1873 - / trunk/BOOK trunk/BOOK/boot/alpha trunk/BOOK/boot/common trunk/BOOK/boot/mips trunk/BOOK/boot/mips64 trunk/BOOK/boot/multilib trunk/BOOK/boot/ppc trunk/BOOK/boot/ppc64 trunk/BOOK/boot/sparc trunk/BOOK/boot/sparc64 trunk/BOOK/boot/x86 trunk/BOOK/boot/x86_64 trunk/BOOK/boot/x86_64-64 trunk/BOOK/chroot/common trunk/BOOK/chroot/mips64 trunk/BOOK/chroot/ppc64 trunk/BOOK/chroot/sparc64 trunk/BOOK/chroot/x86_64 trunk/BOOK/cross-tools/64 trunk/BOOK/cross-tools/alpha trunk/BOOK/cross-tools/common trunk/BOOK/cross-tools/mips trunk/BOOK/cross-tools/mips64 trunk/BOOK/cross-tools/mips64-64 trunk/BOOK/cross-tools/multilib trunk/BOOK/cross-tools/ppc trunk/BOOK/cross-tools/ppc64 trunk/BOOK/cross-tools/sparc trunk/BOOK/cross-tools/sparc64 trunk/BOOK/cross-tools/x86 trunk/BOOK/cross-tools/x86_64 trunk/BOOK/cross-tools/x86_64-64 trunk/BOOK/final-preps trunk/BOOK/final-system/common trunk/BOOK/final-system/multilib trunk/BOOK/final-system/ppc64 trunk/BOOK/introduction/common trunk/BOOK/introduction/sparc64 trunk/BOOK/introduction/x86_64 trunk/BOOK/materials/common trunk/BOOK/partitioning/common trunk/BOOK/prologue/common trunk/BOOK/temp-system/64 trunk/BOOK/temp-system/common trunk/BOOK/temp-system/mips64 trunk/BOOK/temp-system/mips64-64 trunk/BOOK/temp-system/multilib trunk/BOOK/temp-system/x86 trunk/BOOK/temp-system/x86_64 trunk/BOOK/temp-system/x86_64-64 trunk/BOOK/the-end

jim at linuxfromscratch.org jim at linuxfromscratch.org
Sat Jul 1 13:29:40 PDT 2006


Author: jim
Date: 2006-07-01 14:29:29 -0600 (Sat, 01 Jul 2006)
New Revision: 1873

Modified:
   /
   trunk/BOOK/
   trunk/BOOK/Makefile
   trunk/BOOK/README
   trunk/BOOK/boot/alpha/kernel.xml
   trunk/BOOK/boot/common/changingowner.xml
   trunk/BOOK/boot/common/devices.xml
   trunk/BOOK/boot/common/e2fsprogs.xml
   trunk/BOOK/boot/common/introduction.xml
   trunk/BOOK/boot/common/module-init-tools.xml
   trunk/BOOK/boot/common/udev.xml
   trunk/BOOK/boot/mips/colo-build.xml
   trunk/BOOK/boot/mips/kernel.xml
   trunk/BOOK/boot/mips64/colo-build.xml
   trunk/BOOK/boot/mips64/flags.xml
   trunk/BOOK/boot/mips64/kernel.xml
   trunk/BOOK/boot/multilib/e2fsprogs.xml
   trunk/BOOK/boot/multilib/module-init-tools.xml
   trunk/BOOK/boot/multilib/udev.xml
   trunk/BOOK/boot/ppc/kernel.xml
   trunk/BOOK/boot/ppc/mktemp.xml
   trunk/BOOK/boot/ppc/yaboot-build.xml
   trunk/BOOK/boot/ppc64/e2fsprogs.xml
   trunk/BOOK/boot/ppc64/kernel.xml
   trunk/BOOK/boot/ppc64/mktemp.xml
   trunk/BOOK/boot/ppc64/yaboot-build.xml
   trunk/BOOK/boot/sparc/kernel.xml
   trunk/BOOK/boot/sparc/silo-build.xml
   trunk/BOOK/boot/sparc64/flags.xml
   trunk/BOOK/boot/sparc64/kernel.xml
   trunk/BOOK/boot/x86/grub-build.xml
   trunk/BOOK/boot/x86/kernel.xml
   trunk/BOOK/boot/x86_64-64/bin86.xml
   trunk/BOOK/boot/x86_64/flags.xml
   trunk/BOOK/boot/x86_64/grub-build.xml
   trunk/BOOK/boot/x86_64/kernel.xml
   trunk/BOOK/chroot/common/chroot.xml
   trunk/BOOK/chroot/common/kernfs.xml
   trunk/BOOK/chroot/mips64/flags.xml
   trunk/BOOK/chroot/ppc64/flags.xml
   trunk/BOOK/chroot/sparc64/flags.xml
   trunk/BOOK/chroot/x86_64/flags.xml
   trunk/BOOK/cross-tools/64/binutils.xml
   trunk/BOOK/cross-tools/64/glibc.xml
   trunk/BOOK/cross-tools/alpha/gcc-static.xml
   trunk/BOOK/cross-tools/alpha/glibc-headers.xml
   trunk/BOOK/cross-tools/alpha/variables.xml
   trunk/BOOK/cross-tools/common/binutils.xml
   trunk/BOOK/cross-tools/common/glibc.xml
   trunk/BOOK/cross-tools/mips/variables.xml
   trunk/BOOK/cross-tools/mips64-64/gcc-final.xml
   trunk/BOOK/cross-tools/mips64-64/gcc-static.xml
   trunk/BOOK/cross-tools/mips64/glibc-n32.xml
   trunk/BOOK/cross-tools/mips64/variables.xml
   trunk/BOOK/cross-tools/multilib/binutils.xml
   trunk/BOOK/cross-tools/multilib/glibc-64bit.xml
   trunk/BOOK/cross-tools/multilib/glibc.xml
   trunk/BOOK/cross-tools/ppc/variables.xml
   trunk/BOOK/cross-tools/ppc64/glibc-64bit.xml
   trunk/BOOK/cross-tools/ppc64/glibc.xml
   trunk/BOOK/cross-tools/ppc64/variables.xml
   trunk/BOOK/cross-tools/sparc/variables.xml
   trunk/BOOK/cross-tools/sparc64/variables.xml
   trunk/BOOK/cross-tools/x86/gcc-final.xml
   trunk/BOOK/cross-tools/x86/gcc-static.xml
   trunk/BOOK/cross-tools/x86/variables.xml
   trunk/BOOK/cross-tools/x86_64-64/gcc-static.xml
   trunk/BOOK/cross-tools/x86_64/gcc-final.xml
   trunk/BOOK/cross-tools/x86_64/gcc-static.xml
   trunk/BOOK/cross-tools/x86_64/variables.xml
   trunk/BOOK/final-preps/aboutlfs.xml
   trunk/BOOK/final-preps/addinguser.xml
   trunk/BOOK/final-preps/creatingcrossdir.xml
   trunk/BOOK/final-preps/creatingtoolsdir.xml
   trunk/BOOK/final-preps/settingenviron.xml
   trunk/BOOK/final-system/common/stripping.xml
   trunk/BOOK/final-system/multilib/glibc.xml
   trunk/BOOK/final-system/ppc64/glibc.xml
   trunk/BOOK/introduction/common/changelog.xml
   trunk/BOOK/introduction/sparc64/changelog.xml
   trunk/BOOK/introduction/x86_64/changelog.xml
   trunk/BOOK/materials/common/introduction.xml
   trunk/BOOK/partitioning/common/mounting.xml
   trunk/BOOK/prologue/common/typography.xml
   trunk/BOOK/temp-system/64/binutils.xml
   trunk/BOOK/temp-system/64/ncurses.xml
   trunk/BOOK/temp-system/common/bash.xml
   trunk/BOOK/temp-system/common/binutils.xml
   trunk/BOOK/temp-system/common/coreutils.xml
   trunk/BOOK/temp-system/common/diffutils.xml
   trunk/BOOK/temp-system/common/findutils.xml
   trunk/BOOK/temp-system/common/gawk.xml
   trunk/BOOK/temp-system/common/gettext.xml
   trunk/BOOK/temp-system/common/grep.xml
   trunk/BOOK/temp-system/common/gzip.xml
   trunk/BOOK/temp-system/common/introduction.xml
   trunk/BOOK/temp-system/common/make.xml
   trunk/BOOK/temp-system/common/ncurses.xml
   trunk/BOOK/temp-system/common/patch.xml
   trunk/BOOK/temp-system/common/sed.xml
   trunk/BOOK/temp-system/common/tar.xml
   trunk/BOOK/temp-system/common/texinfo.xml
   trunk/BOOK/temp-system/common/variables.xml
   trunk/BOOK/temp-system/mips64-64/gcc.xml
   trunk/BOOK/temp-system/mips64/gcc.xml
   trunk/BOOK/temp-system/multilib/bash.xml
   trunk/BOOK/temp-system/multilib/binutils.xml
   trunk/BOOK/temp-system/multilib/coreutils.xml
   trunk/BOOK/temp-system/multilib/diffutils.xml
   trunk/BOOK/temp-system/multilib/findutils.xml
   trunk/BOOK/temp-system/multilib/gawk.xml
   trunk/BOOK/temp-system/multilib/gettext.xml
   trunk/BOOK/temp-system/multilib/grep.xml
   trunk/BOOK/temp-system/multilib/gzip.xml
   trunk/BOOK/temp-system/multilib/make.xml
   trunk/BOOK/temp-system/multilib/ncurses.xml
   trunk/BOOK/temp-system/multilib/patch.xml
   trunk/BOOK/temp-system/multilib/sed.xml
   trunk/BOOK/temp-system/multilib/tar.xml
   trunk/BOOK/temp-system/multilib/texinfo.xml
   trunk/BOOK/temp-system/x86/gcc.xml
   trunk/BOOK/temp-system/x86_64-64/gcc.xml
   trunk/BOOK/temp-system/x86_64/gcc.xml
   trunk/BOOK/the-end/reboot.xml
Log:
 r4211 at server (orig r1954):  jim | 2006-07-01 12:48:39 -0700
  r4209 at server:  jim | 2006-07-01 12:46:18 -0700
  Updated variables -
  	LFS_TARGET is now CLFS_TARGET
  	LFS_HOST is now CLFS_HOST
  	LFS_TARGET32 is now CLFS_TARGET32
  	LFS is now CLFS
  	/mnt/lfs is now /mnt/clfs
  
 



Property changes on: 
___________________________________________________________________
Name: svk:merge
   - b6734a72-470d-0410-b049-f317dca95413:/:1953
   + b6734a72-470d-0410-b049-f317dca95413:/:1954


Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 38c7b366-470d-0410-a457-935707c16d9b:/cross-lfs:4208
3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1422
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/cross-lfs:1269
b6734a72-470d-0410-b049-f317dca95413:/trunk/BOOK:1406
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790
   + 38c7b366-470d-0410-a457-935707c16d9b:/cross-lfs:4209
3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1422
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/cross-lfs:1269
b6734a72-470d-0410-b049-f317dca95413:/trunk/BOOK:1406
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790

Modified: trunk/BOOK/Makefile
===================================================================
--- trunk/BOOK/Makefile	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/Makefile	2006-07-01 20:29:29 UTC (rev 1873)
@@ -75,7 +75,7 @@
 	   $(PWD)/stylesheets/wget.xsl $$arch-index.xml
 endef
 
-lfs: toplevel render common
+clfs: toplevel render common
 
 toplevel:
 	@xsltproc --nonet --output $(BASEDIR)/index.html $(PWD)/stylesheets/top-index.xsl $(PWD)/index.xml
@@ -131,4 +131,42 @@
 	$(DLLIST) ; \
 	done
 
-.PHONY: lfs toplevel common render nochunk nochunk_render pdf text validate trouble dump-commands download-list
+target-list:
+	@printf "%-15s %-10s\n" "Architecture" "Build Type" ;\
+	for arch in $(ARCH) ; do \
+	MULTILIB=0 ;\
+	PURE64=0 ;\
+	TEST="`echo $$arch | grep -c -e '-64'`" ;\
+	if [ "$$TEST" = "1" ]; then \
+		PURE64=1 ;\
+	else \
+		TEST="`echo $$arch | grep -c -e '64'`" ;\
+		if [ "$$TEST" = "1" ]; then \
+			MULTILIB=1 ;\
+		fi; \
+	fi; \
+	if [ "$$PURE64" = "1" ]; then \
+		printf "%-15s %-10s\n" $$arch "Pure 64" ;\
+	else \
+		if [ "$$MULTILIB" = "1" ]; then \
+			printf "%-15s %-10s\n" $$arch "Multilib" ;\
+		else \
+			printf "%-15s %-10s\n" $$arch "Default" ;\
+		fi; \
+	fi; \
+	done
+
+help:
+	@printf "%-25s %-20s\n" "Command" "Function"
+	@printf "%-25s %-20s\n" "make download-list" "Create download file lists"
+	@printf "%-25s %-20s\n" "make dump-commands" "Dump all the commands from the book"
+	@printf "%-25s %-20s\n" "make clfs" "Make the standard multilib page book"
+	@printf "%-25s %-20s\n" "make nochunks" "Make single html file book"
+	@printf "%-25s %-20s\n" "make pdf" "Make pdf copy of the book"
+	@printf "%-25s %-20s\n" "make target-list" "Get List of Architecture targets"
+	@printf "%-25s %-20s\n" "make test" "Make a text copy of the book"
+	@printf "%-25s %-20s\n" "make trouble" "Make a copy tha's easy to troubleshoot"
+	@printf "%-25s %-20s\n" "make validate" "Run book validation"
+
+.PHONY: clfs toplevel common render nochunks nochunk_render pdf text validate trouble dump-commands download-list \
+	target-list help

Modified: trunk/BOOK/README
===================================================================
--- trunk/BOOK/README	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/README	2006-07-01 20:29:29 UTC (rev 1873)
@@ -1,4 +1,4 @@
-LFS Book README
+CLFS Book README
 
 This document is meant to instruct the user on how to convert the book's XML 
 source to other formats (e.g. HTML, PDF, PS and TXT).  First, if you have not 
@@ -7,6 +7,10 @@
 INSTALL file, then continue reading for examples how to convert these files into
 various other formats.
 
+By default all books will be generated, to only generate the target your want
+you can specify ARCH={target} to create a particular book to any of the command
+lines below. To get a list of targets use make target-list
+
 XML to XHTML:
 -------------
 make BASEDIR=/path/to/output/location

Modified: trunk/BOOK/boot/alpha/kernel.xml
===================================================================
--- trunk/BOOK/boot/alpha/kernel.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/boot/alpha/kernel.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -66,13 +66,13 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='ae'])"/>
 
-<screen><userinput>make ARCH=alpha CROSS_COMPILE=${LFS_TARGET}- menuconfig</userinput></screen>
+<screen><userinput>make ARCH=alpha CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='m'])"/>
 
-<screen><userinput>make ARCH=alpha CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
+<screen><userinput>make ARCH=alpha CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
@@ -90,7 +90,7 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='s'])"/>
 
-<screen><userinput>make ARCH=alpha CROSS_COMPILE=${LFS_TARGET}- \
+<screen><userinput>make ARCH=alpha CROSS_COMPILE=${CLFS_TARGET}- \
    INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/boot/common/changingowner.xml
===================================================================
--- trunk/BOOK/boot/common/changingowner.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/boot/common/changingowner.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -10,13 +10,13 @@
 
   <title>Changing Ownership</title>
 
-  <para os="a">Currently, the <filename class="directory">$LFS</filename>
+  <para os="a">Currently, the <filename class="directory">$CLFS</filename>
   directory and all of its subdirectories  are owned by the user
   <systemitem class="username">lfs</systemitem>, a user that exists only
-  on the host system. For security reasons, the $LFS root directory and
+  on the host system. For security reasons, the $CLFS root directory and
   all of it subdirectories should be owned by
   <systemitem class="username">root</systemitem>. Change the ownership
-  for $LFS and its subdirectories by running this command:</para>
+  for $CLFS and its subdirectories by running this command:</para>
 
 <screen os="b"><userinput>chown -Rv root:root ${LFS}</userinput></screen>
 

Modified: trunk/BOOK/boot/common/devices.xml
===================================================================
--- trunk/BOOK/boot/common/devices.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/boot/common/devices.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -20,7 +20,7 @@
     <note os="a">
       <para>The commands in the remainder of the book should be run as
       the <systemitem class="username">root</systemitem> user. Also,
-      double-check that $LFS is set as
+      double-check that $CLFS is set as
       <systemitem class="username">root</systemitem>.</para>
     </note>
 

Modified: trunk/BOOK/boot/common/e2fsprogs.xml
===================================================================
--- trunk/BOOK/boot/common/e2fsprogs.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/boot/common/e2fsprogs.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -36,7 +36,7 @@
 
 <screen os="aa"><userinput>../configure --prefix=/tools \
     --enable-elf-shlibs --disable-evms \
-    --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <variablelist os="e">
       <title>The meaning of the configure options:</title>

Modified: trunk/BOOK/boot/common/introduction.xml
===================================================================
--- trunk/BOOK/boot/common/introduction.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/boot/common/introduction.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -17,14 +17,14 @@
   <para>There are a few additional packages that will need to be
   installed to allow you to boot the minimal system. Some of these
   packages will be installed onto the root or in /usr on the CLFS
-  partition ($LFS/bin, $LFS/usr/lib, etc...), rather than /tools, using the
+  partition ($CLFS/bin, $CLFS/usr/lib, etc...), rather than /tools, using the
   "DESTDIR" option with make. This will require the
   <systemitem class="username">lfs</systemitem> user to have write access to
-  the rest of the $LFS partition, so you will need to temporarily change the
-  ownership of $LFS to the <systemitem class="username">lfs</systemitem> user.
+  the rest of the $CLFS partition, so you will need to temporarily change the
+  ownership of $CLFS to the <systemitem class="username">lfs</systemitem> user.
   Run the following command as <systemitem
   class="username">root</systemitem>:</para>
 
-<screen><userinput>chown -v lfs $LFS</userinput></screen>
+<screen><userinput>chown -v lfs $CLFS</userinput></screen>
 
 </sect1>

Modified: trunk/BOOK/boot/common/module-init-tools.xml
===================================================================
--- trunk/BOOK/boot/common/module-init-tools.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/boot/common/module-init-tools.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -27,7 +27,7 @@
     xpointer="xpointer(//*[@os='e'])"/>
 
 <screen os="f"><userinput>./configure --prefix=/ \
-    --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/module-init-tools.xml"

Modified: trunk/BOOK/boot/common/udev.xml
===================================================================
--- trunk/BOOK/boot/common/udev.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/boot/common/udev.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -26,7 +26,7 @@
     href="../../final-system/common/udev.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>make CROSS_COMPILE="${LFS_TARGET}-" CC="${CC}" LD="${CC}" udevdir=/dev</userinput></screen>
+<screen os="b"><userinput>make CROSS_COMPILE="${CLFS_TARGET}-" CC="${CC}" LD="${CC}" udevdir=/dev</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/udev.xml"

Modified: trunk/BOOK/boot/mips/colo-build.xml
===================================================================
--- trunk/BOOK/boot/mips/colo-build.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/boot/mips/colo-build.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -33,7 +33,7 @@
 <screen os="aa"><userinput>cd tools/elf2rfx
 make CC=gcc
 cd ../..
-make CROSS_COMPILE="${LFS_TARGET}-" binary</userinput></screen>
+make CROSS_COMPILE="${CLFS_TARGET}-" binary</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/mips/colo.xml"

Modified: trunk/BOOK/boot/mips/kernel.xml
===================================================================
--- trunk/BOOK/boot/mips/kernel.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/boot/mips/kernel.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -66,13 +66,13 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='ae'])"/>
 
-<screen><userinput>make ARCH=mips CROSS_COMPILE=${LFS_TARGET}- menuconfig</userinput></screen>
+<screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='m'])"/>
 
-<screen><userinput>make ARCH=mips CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
+<screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
@@ -90,7 +90,7 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='s'])"/>
 
-<screen><userinput>make ARCH=mips CROSS_COMPILE=${LFS_TARGET)- \
+<screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET)- \
    INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/boot/mips64/colo-build.xml
===================================================================
--- trunk/BOOK/boot/mips64/colo-build.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/boot/mips64/colo-build.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -37,7 +37,7 @@
 <screen os="aa"><userinput>cd tools/elf2rfx
 make CC=gcc
 cd ../..
-make CC="${CC} ${BUILD64}" CROSS_COMPILE="${LFS_TARGET}-" binary</userinput></screen>
+make CC="${CC} ${BUILD64}" CROSS_COMPILE="${CLFS_TARGET}-" binary</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/colo-build.xml"

Modified: trunk/BOOK/boot/mips64/flags.xml
===================================================================
--- trunk/BOOK/boot/mips64/flags.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/boot/mips64/flags.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -16,6 +16,6 @@
 <screen><userinput>echo export BUILD32=\""${BUILD32}\"" >> ${LFS}/root/.bash_profile
 echo export BUILDN32=\""${BUILDN32}\"" >> ${LFS}/root/.bash_profile
 echo export BUILD64=\""${BUILD64}\"" >> ${LFS}/root/.bash_profile
-echo export LFS_TARGET32=\""${LFS_TARGET32}\"" >> ${LFS}/root/.bash_profile</userinput></screen>
+echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" >> ${LFS}/root/.bash_profile</userinput></screen>
 
 </sect1>

Modified: trunk/BOOK/boot/mips64/kernel.xml
===================================================================
--- trunk/BOOK/boot/mips64/kernel.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/boot/mips64/kernel.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -70,13 +70,13 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='ae'])"/>
 
-<screen><userinput>make ARCH=mips CROSS_COMPILE=${LFS_TARGET}- menuconfig</userinput></screen>
+<screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='m'])"/>
 
-<screen><userinput>make ARCH=mips CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
+<screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
@@ -94,7 +94,7 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='s'])"/>
 
-<screen><userinput>make ARCH=mips CROSS_COMPILE=${LFS_TARGET}- \
+<screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \
    INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/boot/multilib/e2fsprogs.xml
===================================================================
--- trunk/BOOK/boot/multilib/e2fsprogs.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/boot/multilib/e2fsprogs.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -43,7 +43,7 @@
 
 <screen os="aa"><userinput>CC="${CC} ${BUILD64}" ../configure --prefix=/tools \
 --enable-elf-shlibs --disable-evms \
---host=${LFS_TARGET}</userinput></screen>
+--host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/e2fsprogs.xml"

Modified: trunk/BOOK/boot/multilib/module-init-tools.xml
===================================================================
--- trunk/BOOK/boot/multilib/module-init-tools.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/boot/multilib/module-init-tools.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -27,7 +27,7 @@
     xpointer="xpointer(//*[@os='e'])"/>
 
 <screen os="f"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/ \
-   --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+   --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/module-init-tools.xml"

Modified: trunk/BOOK/boot/multilib/udev.xml
===================================================================
--- trunk/BOOK/boot/multilib/udev.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/boot/multilib/udev.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -26,7 +26,7 @@
     href="../common/udev.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>make CROSS_COMPILE="${LFS_TARGET}-" CC="${CC} ${BUILD64}" LD="${CC} ${BUILD64}" \
+<screen os="b"><userinput>make CROSS_COMPILE="${CLFS_TARGET}-" CC="${CC} ${BUILD64}" LD="${CC} ${BUILD64}" \
 	udevdir=/dev</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/boot/ppc/kernel.xml
===================================================================
--- trunk/BOOK/boot/ppc/kernel.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/boot/ppc/kernel.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -58,7 +58,7 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='ae'])"/>
 
-<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${LFS_TARGET}- menuconfig</userinput></screen>
+<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
 
     <warning>
     <para>Ensure you select all of the necessary mac drivers, particularly for
@@ -69,7 +69,7 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='m'])"/>
 
-<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
+<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
@@ -87,7 +87,7 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='s'])"/>
 
-<screen><userinput>make ARCH=ppc CROSS_COMPILE=${LFS_TARGET}- \
+<screen><userinput>make ARCH=ppc CROSS_COMPILE=${CLFS_TARGET}- \
    INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/boot/ppc/mktemp.xml
===================================================================
--- trunk/BOOK/boot/ppc/mktemp.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/boot/ppc/mktemp.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -34,7 +34,7 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
 <screen os="e"><userinput>CC="${CC}" ./configure --prefix=/tools --with-libc\
-    --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/mktemp.xml"

Modified: trunk/BOOK/boot/ppc/yaboot-build.xml
===================================================================
--- trunk/BOOK/boot/ppc/yaboot-build.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/boot/ppc/yaboot-build.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -51,7 +51,7 @@
     will fix this:</para>
 
 <screen><userinput>cp Makefile,{.orig}
-sed -e "s/\(strip \)/${LFS_TARGET}-\1/" \
+sed -e "s/\(strip \)/${CLFS_TARGET}-\1/" \
     -e 's/-o root -g root//' \
     Makefile.orig > Makefile</userinput></screen>
 
@@ -59,13 +59,13 @@
     href="../../final-system/ppc/yaboot.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>make CROSS=${LFS_TARGET}-</userinput></screen>
+<screen><userinput>make CROSS=${CLFS_TARGET}-</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/ppc/yaboot.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
-<screen><userinput>make CROSS=${LFS_TARGET}- ROOT=/tools PREFIX= install</userinput></screen>
+<screen><userinput>make CROSS=${CLFS_TARGET}- ROOT=/tools PREFIX= install</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/boot/ppc64/e2fsprogs.xml
===================================================================
--- trunk/BOOK/boot/ppc64/e2fsprogs.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/boot/ppc64/e2fsprogs.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -55,7 +55,7 @@
 
 <screen os="aa"><userinput>CC="${CC} ${BUILD64}" ../configure --prefix=/tools \
 --enable-elf-shlibs --disable-evms \
---build=${LFS_HOST} --host=${LFS_TARGET} --cache-file=config.cache</userinput></screen>
+--build=${CLFS_HOST} --host=${CLFS_TARGET} --cache-file=config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/e2fsprogs.xml"

Modified: trunk/BOOK/boot/ppc64/kernel.xml
===================================================================
--- trunk/BOOK/boot/ppc64/kernel.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/boot/ppc64/kernel.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -62,13 +62,13 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='ae'])"/>
 
-<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${LFS_TARGET}- menuconfig</userinput></screen>
+<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='m'])"/>
 
-<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
+<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
@@ -86,7 +86,7 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='s'])"/>
 
-<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${LFS_TARGET}- \
+<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \
    INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/boot/ppc64/mktemp.xml
===================================================================
--- trunk/BOOK/boot/ppc64/mktemp.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/boot/ppc64/mktemp.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -42,7 +42,7 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
 <screen os="e"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools --with-libc\
-    --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/mktemp.xml"

Modified: trunk/BOOK/boot/ppc64/yaboot-build.xml
===================================================================
--- trunk/BOOK/boot/ppc64/yaboot-build.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/boot/ppc64/yaboot-build.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -56,7 +56,7 @@
 <screen><userinput>cp Makefile,{.orig}
 sed -e "s/\(-print-libgcc-file-name\)/${BUILD32} \1/" \
             -e "s/\(-Bstatic\)/-melf32ppclinux \1/" \
-            -e "s/\(strip \)/${LFS_TARGET}-\1/" \
+            -e "s/\(strip \)/${CLFS_TARGET}-\1/" \
             -e 's/-o root -g root//' \
     Makefile.orig > Makefile</userinput></screen>
 
@@ -64,7 +64,7 @@
     href="../../final-system/ppc/yaboot.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>CFLAGS=${BUILD32} make CROSS=${LFS_TARGET}-</userinput></screen>
+<screen><userinput>CFLAGS=${BUILD32} make CROSS=${CLFS_TARGET}-</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/ppc/yaboot.xml"
@@ -74,7 +74,7 @@
     href="../../final-system/ppc64/yaboot.xml"
     xpointer="xpointer(//*[@os='j0'])"/>
 
-<screen><userinput>make CROSS=${LFS_TARGET}- ROOT=/tools PREFIX= install 2>&1 | tee instlog</userinput></screen>
+<screen><userinput>make CROSS=${CLFS_TARGET}- ROOT=/tools PREFIX= install 2>&1 | tee instlog</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/ppc64/yaboot.xml"

Modified: trunk/BOOK/boot/sparc/kernel.xml
===================================================================
--- trunk/BOOK/boot/sparc/kernel.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/boot/sparc/kernel.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -58,13 +58,13 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='ae'])"/>
 
-<screen><userinput>make ARCH=sparc CROSS_COMPILE=${LFS_TARGET}- menuconfig</userinput></screen>
+<screen><userinput>make ARCH=sparc CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='m'])"/>
 
-<screen><userinput>make ARCH=sparc CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
+<screen><userinput>make ARCH=sparc CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
@@ -82,7 +82,7 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='s'])"/>
 
-<screen><userinput>make ARCH=sparc CROSS_COMPILE=${LFS_TARGET}- \
+<screen><userinput>make ARCH=sparc CROSS_COMPILE=${CLFS_TARGET}- \
    INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/boot/sparc/silo-build.xml
===================================================================
--- trunk/BOOK/boot/sparc/silo-build.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/boot/sparc/silo-build.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -34,7 +34,7 @@
     href="../../final-system/sparc/silo.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="aa"><userinput>make CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
+<screen os="aa"><userinput>make CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/sparc/silo.xml"

Modified: trunk/BOOK/boot/sparc64/flags.xml
===================================================================
--- trunk/BOOK/boot/sparc64/flags.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/boot/sparc64/flags.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -15,6 +15,6 @@
 
 <screen><userinput>echo export BUILD32=\""${BUILD32}\"" >> ${LFS}/root/.bash_profile
 echo export BUILD64=\""${BUILD64}\"" >> ${LFS}/root/.bash_profile
-echo export LFS_TARGET32=\""${LFS_TARGET32}\"" >> ${LFS}/root/.bash_profile</userinput></screen>
+echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" >> ${LFS}/root/.bash_profile</userinput></screen>
 
 </sect1>

Modified: trunk/BOOK/boot/sparc64/kernel.xml
===================================================================
--- trunk/BOOK/boot/sparc64/kernel.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/boot/sparc64/kernel.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -38,7 +38,7 @@
     href="../x86_64/kernel.xml"
     xpointer="xpointer(//*[@os='m1'])"/>
 
-<screen><userinput>make mrproper ARCH=sparc64 CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
+<screen><userinput>make mrproper ARCH=sparc64 CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
@@ -60,13 +60,13 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='ae'])"/>
 
-<screen><userinput>make ARCH=sparc64 CROSS_COMPILE=${LFS_TARGET}- menuconfig</userinput></screen>
+<screen><userinput>make ARCH=sparc64 CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='m'])"/>
 
-<screen><userinput>make ARCH=sparc64 CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
+<screen><userinput>make ARCH=sparc64 CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
@@ -85,7 +85,7 @@
     xpointer="xpointer(//*[@os='s'])"/>
 
 <screen><userinput>make INSTALL_MOD_PATH=${LFS} ARCH=sparc64 \
-   CROSS_COMPILE=${LFS_TARGET}- modules_install</userinput></screen>
+   CROSS_COMPILE=${CLFS_TARGET}- modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"

Modified: trunk/BOOK/boot/x86/grub-build.xml
===================================================================
--- trunk/BOOK/boot/x86/grub-build.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/boot/x86/grub-build.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -39,7 +39,7 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
 <screen os="aa"><userinput>./configure --prefix=/usr \
-   --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+   --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/x86/grub.xml"

Modified: trunk/BOOK/boot/x86/kernel.xml
===================================================================
--- trunk/BOOK/boot/x86/kernel.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/boot/x86/kernel.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -62,13 +62,13 @@
 
     <para os="ae">Configure the kernel via a menu-driven interface:</para>
 
-<screen><userinput>make ARCH=i386 CROSS_COMPILE=${LFS_TARGET}- menuconfig</userinput></screen>
+<screen><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../bootable/x86/kernel.xml"
     xpointer="xpointer(//*[@os='m'])"/>
 
-<screen><userinput>make ARCH=i386 CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
+<screen><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
 
     <para os="af">If the use of kernel modules can't be avoided, an
     <filename>${LFS}/etc/modprobe.conf</filename> file may be needed.
@@ -90,7 +90,7 @@
     href="../../bootable/x86/kernel.xml"
     xpointer="xpointer(//*[@os='s'])"/>
 
-<screen><userinput>make ARCH=i386 CROSS_COMPILE=${LFS_TARGET}- \
+<screen><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}- \
     INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
 
     <para os="u">After kernel compilation is complete, additional steps are

Modified: trunk/BOOK/boot/x86_64/flags.xml
===================================================================
--- trunk/BOOK/boot/x86_64/flags.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/boot/x86_64/flags.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -15,6 +15,6 @@
 
 <screen><userinput>echo export BUILD32=\""${BUILD32}\"" >> ${LFS}/root/.bash_profile
 echo export BUILD64=\""${BUILD64}\"" >> ${LFS}/root/.bash_profile
-echo export LFS_TARGET32=\""${LFS_TARGET32}\"" >> ${LFS}/root/.bash_profile</userinput></screen>
+echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" >> ${LFS}/root/.bash_profile</userinput></screen>
 
 </sect1>

Modified: trunk/BOOK/boot/x86_64/grub-build.xml
===================================================================
--- trunk/BOOK/boot/x86_64/grub-build.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/boot/x86_64/grub-build.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -31,7 +31,7 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
 <screen os="aa"><userinput>CC="${CC} ${BUILD32}" ./configure --prefix=/usr \
-   --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+   --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/grub-build.xml"

Modified: trunk/BOOK/boot/x86_64/kernel.xml
===================================================================
--- trunk/BOOK/boot/x86_64/kernel.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/boot/x86_64/kernel.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -62,13 +62,13 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='ae'])"/>
 
-<screen><userinput>make ARCH=x86_64 CROSS_COMPILE=${LFS_TARGET}- menuconfig</userinput></screen>
+<screen><userinput>make ARCH=x86_64 CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='m'])"/>
 
-<screen><userinput>make ARCH=x86_64 CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
+<screen><userinput>make ARCH=x86_64 CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
@@ -86,7 +86,7 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='s'])"/>
 
-<screen><userinput>make ARCH=x86_64 CROSS_COMPILE=${LFS_TARGET}- \
+<screen><userinput>make ARCH=x86_64 CROSS_COMPILE=${CLFS_TARGET}- \
    INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/boot/x86_64-64/bin86.xml
===================================================================
--- trunk/BOOK/boot/x86_64-64/bin86.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/boot/x86_64-64/bin86.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -47,8 +47,8 @@
       the PATH when we build lilo, using prefixes to show that their
       output is not for a native system.</para>
 
-<screen os="f"><userinput>install -v -m 755 -s as/as86 /cross-tools/bin/${LFS_TARGET}-as86
-install -v -m 755 -s ld/ld86 /cross-tools/bin/${LFS_TARGET}-ld86</userinput></screen>
+<screen os="f"><userinput>install -v -m 755 -s as/as86 /cross-tools/bin/${CLFS_TARGET}-as86
+install -v -m 755 -s ld/ld86 /cross-tools/bin/${CLFS_TARGET}-ld86</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/chroot/common/chroot.xml
===================================================================
--- trunk/BOOK/chroot/common/chroot.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/chroot/common/chroot.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -16,7 +16,7 @@
   enter the realm that is, at the moment, populated with only the
   temporary tools:</para>
 
-<screen><userinput>chroot "$LFS" /tools/bin/env -i \
+<screen><userinput>chroot "$CLFS" /tools/bin/env -i \
     HOME=/root TERM="$TERM" PS1='\u:\w\$ ' \
     PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \
     /tools/bin/bash --login +h</userinput></screen>
@@ -37,7 +37,7 @@
   <para>From this point on, there is no need to use the
   <envar>LFS</envar> variable anymore, because all work will be
   restricted to the CLFS file system.  This is because the Bash shell is
-  told that <filename class="directory">$LFS</filename> is now the root
+  told that <filename class="directory">$CLFS</filename> is now the root
   (<filename class="directory">/</filename>) directory.</para>
 
   <para>Notice that <filename class="directory">/tools/bin</filename> comes

Modified: trunk/BOOK/chroot/common/kernfs.xml
===================================================================
--- trunk/BOOK/chroot/common/kernfs.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/chroot/common/kernfs.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -22,12 +22,12 @@
   <para>Begin by creating directories onto which the file systems will
   be mounted:</para>
 
-<screen><userinput>mkdir -pv $LFS/{dev,proc,sys}</userinput></screen>
+<screen><userinput>mkdir -pv $CLFS/{dev,proc,sys}</userinput></screen>
 
   <para>Now mount the file systems:</para>
 
-<screen><userinput>mount -vt proc proc $LFS/proc
-mount -vt sysfs sysfs $LFS/sys</userinput></screen>
+<screen><userinput>mount -vt proc proc $CLFS/proc
+mount -vt sysfs sysfs $CLFS/sys</userinput></screen>
 
   <para>Remember that if for any reason you stop working on the CLFS system
   and start again later, it is important to check that these file systems
@@ -37,8 +37,8 @@
   present on the filesystem.  These are needed by the kernel even before
   starting Udev early in the boot process, so we create them here:</para>
 
-<screen><userinput>mknod -m 600 $LFS/dev/console c 5 1
-mknod -m 666 $LFS/dev/null c 1 3</userinput></screen>
+<screen><userinput>mknod -m 600 $CLFS/dev/console c 5 1
+mknod -m 666 $CLFS/dev/null c 1 3</userinput></screen>
 
   <para>Once the system is complete and booting, the rest of our device
   nodes are created by the Udev package.  Since this package is not
@@ -47,13 +47,13 @@
   option in the mount command to make our host system's /dev structure
   appear in the new CLFS filesystem:</para>
 
-<screen><userinput>/tools/bin/mount -o bind /dev $LFS/dev</userinput></screen>
+<screen><userinput>/tools/bin/mount -o bind /dev $CLFS/dev</userinput></screen>
 
   <para>Additional file systems will soon be mounted from within the chroot 
   environment. To keep the host up to date, perform a <quote>fake mount</quote>
   for each of these now:</para>
 
-<screen><userinput>mount -f -vt tmpfs tmpfs $LFS/dev/shm
-mount -f -vt devpts -o gid=10,mode=620 devpts $LFS/dev/pts</userinput></screen>
+<screen><userinput>mount -f -vt tmpfs tmpfs $CLFS/dev/shm
+mount -f -vt devpts -o gid=10,mode=620 devpts $CLFS/dev/pts</userinput></screen>
 
 </sect1>

Modified: trunk/BOOK/chroot/mips64/flags.xml
===================================================================
--- trunk/BOOK/chroot/mips64/flags.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/chroot/mips64/flags.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -19,7 +19,7 @@
 
   <para>You will need to set your host target triplet for o32 bit:</para>
 
-<screen><userinput>export LFS_TARGET32="`echo ${MACH_TYPE}| sed -e 's/64//g'`"</userinput></screen>
+<screen><userinput>export CLFS_TARGET32="`echo ${MACH_TYPE}| sed -e 's/64//g'`"</userinput></screen>
 
    <para>To prevent errors when you come back to your build, we will export these
    variables to prevent any build issues in the future:</para>
@@ -27,6 +27,6 @@
 <screen><userinput>echo export BUILD32=\""${BUILD32}\"" >> ~/.bash_profile
 echo export BUILDN32=\""${BUILDN32}\"" >> ~/.bash_profile
 echo export BUILD64=\""${BUILD64}\"" >> ~/.bash_profile
-echo export LFS_TARGET32=\""${LFS_TARGET32}\"" >> ~/.bash_profile</userinput></screen>
+echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" >> ~/.bash_profile</userinput></screen>
 
 </sect1>

Modified: trunk/BOOK/chroot/ppc64/flags.xml
===================================================================
--- trunk/BOOK/chroot/ppc64/flags.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/chroot/ppc64/flags.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -18,13 +18,13 @@
 
   <para>You will need to set your host target triplet for 32 bit:</para>
 
-<screen><userinput>export LFS_TARGET32="powerpc-unknown-linux-gnu"</userinput></screen>
+<screen><userinput>export CLFS_TARGET32="powerpc-unknown-linux-gnu"</userinput></screen>
 
    <para>To prevent errors when you come back to your build, we will export these
    variables to prevent any build issues in the future:</para>
 
 <screen><userinput>echo export BUILD32=\""${BUILD32}\"" >> ~/.bash_profile
 echo export BUILD64=\""${BUILD64}\"" >> ~/.bash_profile
-echo export LFS_TARGET32=\""${LFS_TARGET32}\"" >> ~/.bash_profile</userinput></screen>
+echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" >> ~/.bash_profile</userinput></screen>
 
 </sect1>

Modified: trunk/BOOK/chroot/sparc64/flags.xml
===================================================================
--- trunk/BOOK/chroot/sparc64/flags.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/chroot/sparc64/flags.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -18,13 +18,13 @@
 
   <para>You will need to set your host target triplet for 32 bit:</para>
 
-<screen><userinput>export LFS_TARGET32="sparcv9-unknown-linux-gnu"</userinput></screen>
+<screen><userinput>export CLFS_TARGET32="sparcv9-unknown-linux-gnu"</userinput></screen>
 
    <para>To prevent errors when you come back to your build, we will export these
    variables to prevent any build issues in the future:</para>
 
 <screen><userinput>echo export BUILD32=\""${BUILD32}\"" >> ~/.bash_profile
 echo export BUILD64=\""${BUILD64}\"" >> ~/.bash_profile
-echo export LFS_TARGET32=\""${LFS_TARGET32}\"" >> ~/.bash_profile</userinput></screen>
+echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" >> ~/.bash_profile</userinput></screen>
 
 </sect1>

Modified: trunk/BOOK/chroot/x86_64/flags.xml
===================================================================
--- trunk/BOOK/chroot/x86_64/flags.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/chroot/x86_64/flags.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -18,13 +18,13 @@
 
   <para>You will need to set your host target triplet for 32 bit:</para>
 
-<screen><userinput>export LFS_TARGET32="i686-pc-linux-gnu"</userinput></screen>
+<screen><userinput>export CLFS_TARGET32="i686-pc-linux-gnu"</userinput></screen>
 
    <para>To prevent errors when you come back to your build, we will export these
    variables to prevent any build issues in the future:</para>
 
 <screen><userinput>echo export BUILD32=\""${BUILD32}\"" >> ~/.bash_profile
 echo export BUILD64=\""${BUILD64}\"" >> ~/.bash_profile
-echo export LFS_TARGET32=\""${LFS_TARGET32}\"" >> ~/.bash_profile</userinput></screen>
+echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" >> ~/.bash_profile</userinput></screen>
 
 </sect1>

Modified: trunk/BOOK/cross-tools/64/binutils.xml
===================================================================
--- trunk/BOOK/cross-tools/64/binutils.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/cross-tools/64/binutils.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -47,7 +47,7 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
 <screen os="ca"><userinput>../binutils-&binutils-version;/configure --prefix=/cross-tools \
-   --host=${LFS_HOST} --target=${LFS_TARGET} --with-lib-path=/tools/lib \
+   --host=${CLFS_HOST} --target=${CLFS_TARGET} --with-lib-path=/tools/lib \
    --disable-nls --enable-shared --enable-64-bit-bfd --disable-multilib</userinput></screen>
 
     <variablelist os="bd">

Modified: trunk/BOOK/cross-tools/64/glibc.xml
===================================================================
--- trunk/BOOK/cross-tools/64/glibc.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/cross-tools/64/glibc.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -70,10 +70,10 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen os="df"><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc ${BUILD64}" \
-    AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
+<screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc ${BUILD64}" \
+    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
     ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${LFS_TARGET} --build=${LFS_HOST} \
+    --host=${CLFS_TARGET} --build=${CLFS_HOST} \
     --disable-profile --enable-add-ons \
     --with-tls --enable-kernel=2.6.0 --with-__thread \
     --with-binutils=/cross-tools/bin --with-headers=/tools/include \

Modified: trunk/BOOK/cross-tools/alpha/gcc-static.xml
===================================================================
--- trunk/BOOK/cross-tools/alpha/gcc-static.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/cross-tools/alpha/gcc-static.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -80,7 +80,7 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
 <screen><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --host=${LFS_HOST} --target=${LFS_TARGET} \
+    --host=${CLFS_HOST} --target=${CLFS_TARGET} \
     --with-local-prefix=/tools --disable-nls --disable-shared \
     --disable-threads --enable-languages=c</userinput></screen>
 

Modified: trunk/BOOK/cross-tools/alpha/glibc-headers.xml
===================================================================
--- trunk/BOOK/cross-tools/alpha/glibc-headers.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/cross-tools/alpha/glibc-headers.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -52,10 +52,10 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
 <screen os="s3"><userinput>CC=gcc ../glibc-&glibc-version;/configure --prefix=/tools \
-   --host=${LFS_TARGET} --build=${LFS_HOST} \
+   --host=${CLFS_TARGET} --build=${CLFS_HOST} \
    --disable-sanity-checks --enable-kernel=2.6.0 \
    --with-headers=/tools/include --cache-file=config.cache \
-   --with-binutils=/cross-tools/${LFS_TARGET}/bin</userinput></screen>
+   --with-binutils=/cross-tools/${CLFS_TARGET}/bin</userinput></screen>
 
     <warning os="e1">
       <para><emphasis>Any</emphasis> error message you see about nptl at this point
@@ -82,18 +82,18 @@
          </varlistentry>
 	
          <varlistentry os="ca3">
-            <term><parameter>--build=${LFS_HOST}</parameter></term>
+            <term><parameter>--build=${CLFS_HOST}</parameter></term>
             <listitem>
                <para>When used with --host, this creates a cross-architecture
-                  executable that creates files for ${LFS_TARGET} but runs on ${LFS_HOST).</para>
+                  executable that creates files for ${CLFS_TARGET} but runs on ${CLFS_HOST).</para>
             </listitem>
         </varlistentry>
  	
         <varlistentry os="ca4">
-           <term><parameter>--host=${LFS_TARGET}</parameter></term>
+           <term><parameter>--host=${CLFS_TARGET}</parameter></term>
            <listitem>
                <para>When used with --build, this creates a cross-architecture
-                  executable that creates files for ${LFS_TARGET} but runs on ${LFS_HOST).</para>
+                  executable that creates files for ${CLFS_TARGET} but runs on ${CLFS_HOST).</para>
            </listitem>
         </varlistentry>
  	
@@ -123,7 +123,7 @@
        </varlistentry>
  	
        <varlistentry os="ca8">
-           <term><parameter>--with-binutils=/cross-tools/${LFS_TARGET}/bin</parameter></term>
+           <term><parameter>--with-binutils=/cross-tools/${CLFS_TARGET}/bin</parameter></term>
            <listitem>
               <para>This tells GLIBC to use the binutils for our specific target architecture.</para>
             </listitem>

Modified: trunk/BOOK/cross-tools/alpha/variables.xml
===================================================================
--- trunk/BOOK/cross-tools/alpha/variables.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/cross-tools/alpha/variables.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -24,7 +24,7 @@
     href="../x86_64/variables.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>export LFS_TARGET="alpha-unknown-linux-gnu"</userinput></screen>
+<screen os="d"><userinput>export CLFS_TARGET="alpha-unknown-linux-gnu"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86_64/variables.xml"

Modified: trunk/BOOK/cross-tools/common/binutils.xml
===================================================================
--- trunk/BOOK/cross-tools/common/binutils.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/cross-tools/common/binutils.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -45,7 +45,7 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
 <screen os="bc"><userinput>../binutils-&binutils-version;/configure --prefix=/cross-tools \
-    --host=${LFS_HOST} --target=${LFS_TARGET} --with-lib-path=/tools/lib \
+    --host=${CLFS_HOST} --target=${CLFS_TARGET} --with-lib-path=/tools/lib \
     --disable-nls --enable-shared --disable-multilib</userinput></screen>
 
     <variablelist os="bd">
@@ -61,18 +61,18 @@
       </varlistentry>
 
       <varlistentry os="bd2">
-        <term><parameter>--host=${LFS_HOST}</parameter></term>
+        <term><parameter>--host=${CLFS_HOST}</parameter></term>
         <listitem>
           <para>When used with --target, this creates a cross-architecture
-          executable that creates files for ${LFS_TARGET} but runs on ${LFS_HOST).</para>
+          executable that creates files for ${CLFS_TARGET} but runs on ${CLFS_HOST).</para>
         </listitem>
       </varlistentry>
 
       <varlistentry os="bd3">
-        <term><parameter>--target=${LFS_TARGET}</parameter></term>
+        <term><parameter>--target=${CLFS_TARGET}</parameter></term>
         <listitem>
           <para>When used with --host, this creates a cross-architecture
-          executable that creates files for ${LFS_TARGET} but runs on ${LFS_HOST).</para>
+          executable that creates files for ${CLFS_TARGET} but runs on ${CLFS_HOST).</para>
         </listitem>
       </varlistentry>
 

Modified: trunk/BOOK/cross-tools/common/glibc.xml
===================================================================
--- trunk/BOOK/cross-tools/common/glibc.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/cross-tools/common/glibc.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -64,10 +64,10 @@
     href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen os="df"><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc" \
-    AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
+<screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc" \
+    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
     ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${LFS_TARGET} --build=${LFS_HOST} \
+    --host=${CLFS_TARGET} --build=${CLFS_HOST} \
     --disable-profile --enable-add-ons \
     --with-tls --enable-kernel=2.6.0 --with-__thread \
     --with-binutils=/cross-tools/bin --with-headers=/tools/include \
@@ -85,7 +85,7 @@
       </varlistentry>
 
       <varlistentry os="dg2">
-        <term><parameter>CC="${LFS_TARGET}-gcc"</parameter></term>
+        <term><parameter>CC="${CLFS_TARGET}-gcc"</parameter></term>
         <listitem>
           <para>This forces Glibc to use the GCC compiler that we made for our target
           architecture.</para>
@@ -93,7 +93,7 @@
       </varlistentry>
 
       <varlistentry os="dg3">
-        <term><parameter>AR="${LFS_TARGET}-ar"</parameter></term>
+        <term><parameter>AR="${CLFS_TARGET}-ar"</parameter></term>
         <listitem>
           <para>This forces Glibc to use the <command>ar</command> utility
           we made for our target architecture.</para>
@@ -101,7 +101,7 @@
       </varlistentry>
 
       <varlistentry os="dg4">
-        <term><parameter>RANLIB="${LFS_TARGET}-ranlib"</parameter></term>
+        <term><parameter>RANLIB="${CLFS_TARGET}-ranlib"</parameter></term>
         <listitem>
           <para>This forces Glibc to use the <command>ranlib</command> utility
           we made for our target architecture.</para>

Modified: trunk/BOOK/cross-tools/mips/variables.xml
===================================================================
--- trunk/BOOK/cross-tools/mips/variables.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/cross-tools/mips/variables.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -26,11 +26,11 @@
 
     <para os="aa">For a MIPS Little Endian Machine:</para>
 
-<screen os="ab"><userinput>export LFS_TARGET="mipsel-unknown-linux-gnu"</userinput></screen>
+<screen os="ab"><userinput>export CLFS_TARGET="mipsel-unknown-linux-gnu"</userinput></screen>
 
     <para os="ac">For a MIPS Big Endian Machine:</para>
 
-<screen os="ad"><userinput>export LFS_TARGET="mips-unknown-linux-gnu"</userinput></screen>
+<screen os="ad"><userinput>export CLFS_TARGET="mips-unknown-linux-gnu"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86_64/variables.xml"

Modified: trunk/BOOK/cross-tools/mips64/glibc-n32.xml
===================================================================
--- trunk/BOOK/cross-tools/mips64/glibc-n32.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/cross-tools/mips64/glibc-n32.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -91,10 +91,10 @@
     href="glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen os="df"><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc ${BUILDN32}" \
-    AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
+<screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc ${BUILDN32}" \
+    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
     ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${LFS_TARGET} --build=${LFS_HOST} --libdir=/tools/lib32 \
+    --host=${CLFS_TARGET} --build=${CLFS_HOST} --libdir=/tools/lib32 \
     --disable-profile --enable-add-ons \
     --with-tls --enable-kernel=2.6.0 --with-__thread \
     --with-binutils=/cross-tools/bin --with-headers=/tools/include \
@@ -104,7 +104,7 @@
       <title>The meaning of the new configure options:</title>
 
       <varlistentry os="fa1">
-        <term><parameter>CC="${LFS_TARGET}-gcc ${BUILDN32}"</parameter></term>
+        <term><parameter>CC="${CLFS_TARGET}-gcc ${BUILDN32}"</parameter></term>
         <listitem>
           <para>Forces Glibc to utilize our target architecture GCC utilizing
           the N32 flags.</para>

Modified: trunk/BOOK/cross-tools/mips64/variables.xml
===================================================================
--- trunk/BOOK/cross-tools/mips64/variables.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/cross-tools/mips64/variables.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -28,19 +28,19 @@
     href="../mips/variables.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
 
-<screen os="ab"><userinput>export LFS_TARGET="mips64el-unknown-linux-gnu"</userinput></screen>
+<screen os="ab"><userinput>export CLFS_TARGET="mips64el-unknown-linux-gnu"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/variables.xml"
     xpointer="xpointer(//*[@os='ac'])"/>
 
-<screen os="ad"><userinput>export LFS_TARGET="mips64-unknown-linux-gnu"</userinput></screen>
+<screen os="ad"><userinput>export CLFS_TARGET="mips64-unknown-linux-gnu"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86_64/variables.xml"
     xpointer="xpointer(//*[@os='m1'])"/>
 
-<screen os="m2"><userinput>export LFS_TARGET32="`echo ${LFS_TARGET}| sed -e 's/64//g'`"</userinput></screen>
+<screen os="m2"><userinput>export CLFS_TARGET32="`echo ${CLFS_TARGET}| sed -e 's/64//g'`"</userinput></screen>
 
   <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
 

Modified: trunk/BOOK/cross-tools/mips64-64/gcc-final.xml
===================================================================
--- trunk/BOOK/cross-tools/mips64-64/gcc-final.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/cross-tools/mips64-64/gcc-final.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -87,7 +87,7 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
 <screen os="bf" ><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --target=${LFS_TARGET} --host=${LFS_HOST} --with-abi=64 \
+    --target=${CLFS_TARGET} --host=${CLFS_HOST} --with-abi=64 \
     --with-local-prefix=/tools --disable-nls --enable-shared \
     --enable-languages=c,c++ --enable-__cxa_atexit --disable-multilib \
     --enable-c99 --enable-long-long --enable-threads=posix</userinput></screen>

Modified: trunk/BOOK/cross-tools/mips64-64/gcc-static.xml
===================================================================
--- trunk/BOOK/cross-tools/mips64-64/gcc-static.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/cross-tools/mips64-64/gcc-static.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -80,7 +80,7 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
 <screen os="al"><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --host=${LFS_HOST} --target=${LFS_TARGET} --disable-mutlilib \
+    --host=${CLFS_HOST} --target=${CLFS_TARGET} --disable-mutlilib \
     --with-local-prefix=/tools --disable-nls --disable-shared \
     --disable-threads --enable-languages=c --with-abi=64</userinput></screen>
 

Modified: trunk/BOOK/cross-tools/multilib/binutils.xml
===================================================================
--- trunk/BOOK/cross-tools/multilib/binutils.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/cross-tools/multilib/binutils.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -55,7 +55,7 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
 <screen os="bc"><userinput>../binutils-&binutils-version;/configure --prefix=/cross-tools \
-   --host=${LFS_HOST} --target=${LFS_TARGET} --with-lib-path=/tools/lib \
+   --host=${CLFS_HOST} --target=${CLFS_TARGET} --with-lib-path=/tools/lib \
    --disable-nls --enable-shared --enable-64-bit-bfd</userinput></screen>
 
     <variablelist os="bd">

Modified: trunk/BOOK/cross-tools/multilib/glibc-64bit.xml
===================================================================
--- trunk/BOOK/cross-tools/multilib/glibc-64bit.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/cross-tools/multilib/glibc-64bit.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -75,10 +75,10 @@
     href="glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen os="df"><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc ${BUILD64}" \
-    AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
+<screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc ${BUILD64}" \
+    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
     ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${LFS_TARGET} --build=${LFS_HOST} --libdir=/tools/lib64 \
+    --host=${CLFS_TARGET} --build=${CLFS_HOST} --libdir=/tools/lib64 \
     --disable-profile --enable-add-ons \
     --with-tls --enable-kernel=2.6.0 --with-__thread \
     --with-binutils=/cross-tools/bin --with-headers=/tools/include \
@@ -88,7 +88,7 @@
       <title>The meaning of the new configure options:</title>
 
       <varlistentry os="fa1">
-        <term><parameter>CC="${LFS_TARGET}-gcc ${BUILD64}"</parameter></term>
+        <term><parameter>CC="${CLFS_TARGET}-gcc ${BUILD64}"</parameter></term>
         <listitem>
           <para>Forces Glibc to utilize our target architecture GCC utilizing
           the 64 Bit flags.</para>

Modified: trunk/BOOK/cross-tools/multilib/glibc.xml
===================================================================
--- trunk/BOOK/cross-tools/multilib/glibc.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/cross-tools/multilib/glibc.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -70,10 +70,10 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen os="df"><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc ${BUILD32}" \
-    AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
+<screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc ${BUILD32}" \
+    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
     ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${LFS_TARGET32} --build=${LFS_HOST} \
+    --host=${CLFS_TARGET32} --build=${CLFS_HOST} \
     --disable-profile --enable-add-ons \
     --with-tls --enable-kernel=2.6.0 --with-__thread \
     --with-binutils=/cross-tools/bin --with-headers=/tools/include \
@@ -87,7 +87,7 @@
       xpointer="xpointer(//*[@os='dg1'])"/>
 
       <varlistentry os="ea1">
-        <term><parameter>CC="${LFS_TARGET}-gcc ${BUILD32}"</parameter></term>
+        <term><parameter>CC="${CLFS_TARGET}-gcc ${BUILD32}"</parameter></term>
         <listitem>
           <para>Forces Glibc to utilize our target architecture GCC utilizing
           the 32 Bit flags.</para>

Modified: trunk/BOOK/cross-tools/ppc/variables.xml
===================================================================
--- trunk/BOOK/cross-tools/ppc/variables.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/cross-tools/ppc/variables.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -24,7 +24,7 @@
     href="../x86_64/variables.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>export LFS_TARGET="powerpc-unknown-linux-gnu"</userinput></screen>
+<screen os="d"><userinput>export CLFS_TARGET="powerpc-unknown-linux-gnu"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86_64/variables.xml"

Modified: trunk/BOOK/cross-tools/ppc64/glibc-64bit.xml
===================================================================
--- trunk/BOOK/cross-tools/ppc64/glibc-64bit.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/cross-tools/ppc64/glibc-64bit.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -84,10 +84,10 @@
     href="glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen os="df"><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc ${BUILD64}" \
-    AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
+<screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc ${BUILD64}" \
+    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
     ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${LFS_TARGET} --build=${LFS_HOST} --libdir=/tools/lib64 \
+    --host=${CLFS_TARGET} --build=${CLFS_HOST} --libdir=/tools/lib64 \
     --disable-profile --enable-add-ons \
     --with-tls --enable-kernel=2.6.0 --with-__thread \
     --with-binutils=/cross-tools/bin --with-headers=/tools/include \
@@ -97,7 +97,7 @@
       <title>The meaning of the new configure options:</title>
 
       <varlistentry os="fa1">
-        <term><parameter>CC="${LFS_TARGET}-gcc ${BUILD64}"</parameter></term>
+        <term><parameter>CC="${CLFS_TARGET}-gcc ${BUILD64}"</parameter></term>
         <listitem>
           <para>Forces Glibc to utilize our target architecture GCC utilizing
           the 64 Bit flags.</para>

Modified: trunk/BOOK/cross-tools/ppc64/glibc.xml
===================================================================
--- trunk/BOOK/cross-tools/ppc64/glibc.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/cross-tools/ppc64/glibc.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -87,10 +87,10 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen os="df"><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc ${BUILD32}" \
-    AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
+<screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc ${BUILD32}" \
+    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
     ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${LFS_TARGET32} --build=${LFS_HOST} \
+    --host=${CLFS_TARGET32} --build=${CLFS_HOST} \
     --disable-profile --enable-add-ons \
     --with-tls --enable-kernel=2.6.0 --with-__thread \
     --with-binutils=/cross-tools/bin --with-headers=/tools/include \
@@ -104,7 +104,7 @@
       xpointer="xpointer(//*[@os='dg1'])"/>
 
       <varlistentry os="ea1">
-        <term><parameter>CC="${LFS_TARGET}-gcc ${BUILD32}"</parameter></term>
+        <term><parameter>CC="${CLFS_TARGET}-gcc ${BUILD32}"</parameter></term>
         <listitem>
           <para>Forces Glibc to utilize our target architecture GCC utilizing
           the 32 Bit flags.</para>

Modified: trunk/BOOK/cross-tools/ppc64/variables.xml
===================================================================
--- trunk/BOOK/cross-tools/ppc64/variables.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/cross-tools/ppc64/variables.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -24,13 +24,13 @@
     href="../x86_64/variables.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>export LFS_TARGET="powerpc64-unknown-linux-gnu"</userinput></screen>
+<screen os="d"><userinput>export CLFS_TARGET="powerpc64-unknown-linux-gnu"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86_64/variables.xml"
     xpointer="xpointer(//*[@os='m1'])"/>
 
-<screen os="m2"><userinput>export LFS_TARGET32="powerpc-unknown-linux-gnu"</userinput></screen>
+<screen os="m2"><userinput>export CLFS_TARGET32="powerpc-unknown-linux-gnu"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86_64/variables.xml"

Modified: trunk/BOOK/cross-tools/sparc/variables.xml
===================================================================
--- trunk/BOOK/cross-tools/sparc/variables.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/cross-tools/sparc/variables.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -24,7 +24,7 @@
     href="../x86_64/variables.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>export LFS_TARGET="sparc-unknown-linux-gnu"</userinput></screen>
+<screen os="d"><userinput>export CLFS_TARGET="sparc-unknown-linux-gnu"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86_64/variables.xml"

Modified: trunk/BOOK/cross-tools/sparc64/variables.xml
===================================================================
--- trunk/BOOK/cross-tools/sparc64/variables.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/cross-tools/sparc64/variables.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -24,13 +24,13 @@
     href="../x86/variables.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>export LFS_TARGET="sparc64-unknown-linux-gnu"</userinput></screen>
+<screen os="d"><userinput>export CLFS_TARGET="sparc64-unknown-linux-gnu"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86_64/variables.xml"
     xpointer="xpointer(//*[@os='m1'])"/>
 
-<screen os="m2"><userinput>export LFS_TARGET32="sparc-unknown-linux-gnu"</userinput></screen>
+<screen os="m2"><userinput>export CLFS_TARGET32="sparc-unknown-linux-gnu"</userinput></screen>
 
   <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
 

Modified: trunk/BOOK/cross-tools/x86/gcc-final.xml
===================================================================
--- trunk/BOOK/cross-tools/x86/gcc-final.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/cross-tools/x86/gcc-final.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -93,7 +93,7 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
 <screen os="bf"><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --target=${LFS_TARGET} --host=${LFS_HOST} --disable-multilib \
+    --target=${CLFS_TARGET} --host=${CLFS_HOST} --disable-multilib \
     --with-local-prefix=/tools --disable-nls --enable-shared \
     --enable-languages=c,c++ --enable-__cxa_atexit \
     --enable-c99 --enable-long-long --enable-threads=posix</userinput></screen>
@@ -144,8 +144,8 @@
 
     <para os="bh">Continue with compiling the package:</para>
 
-<screen os="bi"><userinput>make AS_FOR_TARGET="${LFS_TARGET}-as" \
-    LD_FOR_TARGET="${LFS_TARGET}-ld"</userinput></screen>
+<screen os="bi"><userinput>make AS_FOR_TARGET="${CLFS_TARGET}-as" \
+    LD_FOR_TARGET="${CLFS_TARGET}-ld"</userinput></screen>
 
     <para os="bj">Install the package:</para>
 

Modified: trunk/BOOK/cross-tools/x86/gcc-static.xml
===================================================================
--- trunk/BOOK/cross-tools/x86/gcc-static.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/cross-tools/x86/gcc-static.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -72,7 +72,7 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
 <screen os="al"><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --host=${LFS_HOST} --target=${LFS_TARGET} --disable-multilib \
+    --host=${CLFS_HOST} --target=${CLFS_TARGET} --disable-multilib \
     --with-local-prefix=/tools --disable-nls --disable-shared \
     --disable-threads --enable-languages=c</userinput></screen>
 

Modified: trunk/BOOK/cross-tools/x86/variables.xml
===================================================================
--- trunk/BOOK/cross-tools/x86/variables.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/cross-tools/x86/variables.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -19,7 +19,7 @@
   particular needs. To set this information you can issue the following
   command:</para>
 
-<screen os="b"><userinput>export LFS_HOST="`echo ${MACHTYPE} | sed -e 's/unknown/cross/g' -e 's/-pc-/-cross-/g'`"</userinput></screen>
+<screen os="b"><userinput>export CLFS_HOST="`echo ${MACHTYPE} | sed -e 's/unknown/cross/g' -e 's/-pc-/-cross-/g'`"</userinput></screen>
 
   <para os="c">Now you will need to set the target triplet for the target
   architecture. You can do this by running the same command as above, just
@@ -27,15 +27,15 @@
   target machine, you can use the table at the bottom of this page. Set
   the command using the method listed below:</para>
 
-<screen os="d"><userinput>export LFS_TARGET="{target triplet}"</userinput></screen>
+<screen os="d"><userinput>export CLFS_TARGET="{target triplet}"</userinput></screen>
 
   <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
 
   <para os="e">Now we will add these to <filename>~/.bashrc</filename>, just in
   case you have to exit and restart building later:</para>
 
-<screen os="f"><userinput>echo export LFS_HOST=\""${LFS_HOST}\"" >> ~/.bashrc
-echo export LFS_TARGET=\""${LFS_TARGET}\"" >> ~/.bashrc</userinput></screen>
+<screen os="f"><userinput>echo export CLFS_HOST=\""${CLFS_HOST}\"" >> ~/.bashrc
+echo export CLFS_TARGET=\""${CLFS_TARGET}\"" >> ~/.bashrc</userinput></screen>
 
   <table os="g">
     <title>Processor Type and  Target Triplets</title>

Modified: trunk/BOOK/cross-tools/x86_64/gcc-final.xml
===================================================================
--- trunk/BOOK/cross-tools/x86_64/gcc-final.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/cross-tools/x86_64/gcc-final.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -94,7 +94,7 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
 <screen os="bf"><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --target=${LFS_TARGET} --host=${LFS_HOST} \
+    --target=${CLFS_TARGET} --host=${CLFS_HOST} \
     --with-local-prefix=/tools --disable-nls --enable-shared \
     --enable-languages=c,c++ --enable-__cxa_atexit \
     --enable-c99 --enable-long-long --enable-threads=posix</userinput></screen>

Modified: trunk/BOOK/cross-tools/x86_64/gcc-static.xml
===================================================================
--- trunk/BOOK/cross-tools/x86_64/gcc-static.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/cross-tools/x86_64/gcc-static.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -80,7 +80,7 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
 <screen os="al"><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --host=${LFS_HOST} --target=${LFS_TARGET} \
+    --host=${CLFS_HOST} --target=${CLFS_TARGET} \
     --with-local-prefix=/tools --disable-nls --disable-shared \
     --disable-threads --enable-languages=c</userinput></screen>
 

Modified: trunk/BOOK/cross-tools/x86_64/variables.xml
===================================================================
--- trunk/BOOK/cross-tools/x86_64/variables.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/cross-tools/x86_64/variables.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -22,11 +22,11 @@
 
   <para os="c">Now we will set our Target Triplet:</para>
 
-<screen os="d"><userinput>export LFS_TARGET="x86_64-unknown-linux-gnu"</userinput></screen>
+<screen os="d"><userinput>export CLFS_TARGET="x86_64-unknown-linux-gnu"</userinput></screen>
 
   <para os="m1">Now we will set our Target Triplet for 32 Bits:</para>
 
-<screen os="m2"><userinput>export LFS_TARGET32="i686-pc-linux-gnu"</userinput></screen>
+<screen os="m2"><userinput>export CLFS_TARGET32="i686-pc-linux-gnu"</userinput></screen>
 
   <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
 
@@ -34,8 +34,8 @@
     href="../x86/variables.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen os="f"><userinput>echo export LFS_HOST=\""${LFS_HOST}\"" >> ~/.bashrc
-echo export LFS_TARGET=\""${LFS_TARGET}\"" >> ~/.bashrc
-echo export LFS_TARGET32=\""${LFS_TARGET32}\"" >> ~/.bashrc</userinput></screen>
+<screen os="f"><userinput>echo export CLFS_HOST=\""${CLFS_HOST}\"" >> ~/.bashrc
+echo export CLFS_TARGET=\""${CLFS_TARGET}\"" >> ~/.bashrc
+echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" >> ~/.bashrc</userinput></screen>
 
 </sect1>

Modified: trunk/BOOK/cross-tools/x86_64-64/gcc-static.xml
===================================================================
--- trunk/BOOK/cross-tools/x86_64-64/gcc-static.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/cross-tools/x86_64-64/gcc-static.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -78,7 +78,7 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
 <screen os="al"><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --host=${LFS_HOST} --target=${LFS_TARGET} --disable-multilib \
+    --host=${CLFS_HOST} --target=${CLFS_TARGET} --disable-multilib \
     --with-local-prefix=/tools --disable-nls --disable-shared \
     --disable-threads --enable-languages=c</userinput></screen>
 

Modified: trunk/BOOK/final-preps/aboutlfs.xml
===================================================================
--- trunk/BOOK/final-preps/aboutlfs.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/final-preps/aboutlfs.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -8,14 +8,14 @@
 <sect1 id="ch-final-preps-aboutlfs">
   <?dbhtml filename="aboutlfs.html"?>
 
-  <title>About $LFS</title>
+  <title>About $CLFS</title>
 
   <para>Throughout this book, the environment variable <envar>LFS</envar> will
   be used several times. It is paramount that this variable is always defined.
   It should be set to the mount point chosen for the CLFS partition.
   Check that the <envar>LFS</envar> variable is set up properly with:</para>
 
-<screen><userinput>echo $LFS</userinput></screen>
+<screen><userinput>echo $CLFS</userinput></screen>
 
   <para>Make sure the output shows the path to the CLFS partition's mount
   point, which is <filename class="directory">/mnt/lfs</filename> if the
@@ -25,17 +25,17 @@
 <screen><userinput>export LFS=/mnt/lfs</userinput></screen>
 
   <para>Having this variable set is beneficial in that commands such as
-  <command>install -dv $LFS/tools</command> can be typed literally. The shell
-  will automatically replace <quote>$LFS</quote> with
+  <command>install -dv $CLFS/tools</command> can be typed literally. The shell
+  will automatically replace <quote>$CLFS</quote> with
   <quote>/mnt/lfs</quote> (or whatever the variable was set to) when it
   processes the command line.</para>
 
-  <para>If you haven't created the <filename class="directory">$LFS</filename>
+  <para>If you haven't created the <filename class="directory">$CLFS</filename>
   directory, do so at this time by issuing the following commands:</para>
 
-<screen><userinput>install -dv $LFS</userinput></screen>
+<screen><userinput>install -dv $CLFS</userinput></screen>
 
-  <para>Do not forget to check that <envar>$LFS</envar> is set whenever
+  <para>Do not forget to check that <envar>$CLFS</envar> is set whenever
   you leave and reenter the current working environment (as when doing a
   <quote>su</quote> to <systemitem class="username">root</systemitem> or
   another user).</para>

Modified: trunk/BOOK/final-preps/addinguser.xml
===================================================================
--- trunk/BOOK/final-preps/addinguser.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/final-preps/addinguser.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -78,17 +78,17 @@
 <screen><userinput>passwd lfs</userinput></screen>
 
   <para>Grant <systemitem class="username">lfs</systemitem> full access to
-  <filename class="directory">$LFS/cross-tools</filename> and
-  <filename class="directory">$LFS/tools</filename> by making <systemitem
+  <filename class="directory">$CLFS/cross-tools</filename> and
+  <filename class="directory">$CLFS/tools</filename> by making <systemitem
   class="username">lfs</systemitem> the directorys' owner:</para>
 
-<screen><userinput>chown -v lfs $LFS/tools
-chown -v lfs $LFS/cross-tools</userinput></screen>
+<screen><userinput>chown -v lfs $CLFS/tools
+chown -v lfs $CLFS/cross-tools</userinput></screen>
 
   <para>If a separate working directory was created as suggested, 
   give user <systemitem class="username">lfs</systemitem> ownership of this directory:</para>
 
-<screen><userinput>chown -v lfs $LFS/sources</userinput></screen>
+<screen><userinput>chown -v lfs $CLFS/sources</userinput></screen>
 
   <para>Next, login as user <systemitem class="username">lfs</systemitem>.
   This can be done via a virtual console, through a display manager, or

Modified: trunk/BOOK/final-preps/creatingcrossdir.xml
===================================================================
--- trunk/BOOK/final-preps/creatingcrossdir.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/final-preps/creatingcrossdir.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -8,11 +8,11 @@
 <sect1 id="ch-final-preps-creatingcrossdir">
   <?dbhtml filename="creatingcrossdir.html"?>
 
-  <title>Creating the $LFS/cross-tools Directory</title>
+  <title>Creating the $CLFS/cross-tools Directory</title>
 
   <para>The cross-binutils and cross-compiler built in
   <xref linkend="chapter-cross-tools"/> will be installed under
-  <filename class="directory">$LFS/cross-tools</filename> to keep them
+  <filename class="directory">$CLFS/cross-tools</filename> to keep them
   separate from the host programs. The programs compiled here are
   cross-tools and will not be a part of the final CLFS system or the
   temp-system. By keeping these programs in a separate directory, they
@@ -21,18 +21,18 @@
   <para>Create the required directory by running the following as
   <systemitem class="username">root</systemitem>:</para>
 
-<screen><userinput>install -dv $LFS/cross-tools</userinput></screen>
+<screen><userinput>install -dv $CLFS/cross-tools</userinput></screen>
 
   <para>The next step is to create a <filename
   class="symlink">/cross-tools</filename> symlink on the host system.
   This will point to the newly-created directory on the CLFS partition.
   Run this command as  <systemitem class="username">root</systemitem> as well:</para>
 
-<screen><userinput>ln -sv $LFS/cross-tools /</userinput></screen>
+<screen><userinput>ln -sv $CLFS/cross-tools /</userinput></screen>
 
   <para>The symlink isn't technically necessary (though the book's
   instructions do assume its existence), but is there mainly for
-  consistency (because /tools is also symlinked to $LFS/tools) and to
+  consistency (because /tools is also symlinked to $CLFS/tools) and to
   simplify the installation of the cross-compile tools.</para>
 
 </sect1>

Modified: trunk/BOOK/final-preps/creatingtoolsdir.xml
===================================================================
--- trunk/BOOK/final-preps/creatingtoolsdir.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/final-preps/creatingtoolsdir.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -8,10 +8,10 @@
 <sect1 id="ch-final-preps-creatingtoolsdir">
   <?dbhtml filename="creatingtoolsdir.html"?>
 
-  <title>Creating the $LFS/tools Directory</title>
+  <title>Creating the $CLFS/tools Directory</title>
 
   <para>All programs compiled in <xref linkend="chapter-temp-system"/>
-  will be installed under <filename class="directory">$LFS/tools</filename>
+  will be installed under <filename class="directory">$CLFS/tools</filename>
   to keep them separate from the programs compiled in <xref
   linkend="chapter-building-system"/>. The programs compiled here are
   temporary tools and will not be a part of the final CLFS system. By keeping
@@ -23,14 +23,14 @@
   <para>Create the required directory by running the following as
   <systemitem class="username">root</systemitem>:</para>
 
-<screen><userinput>install -dv $LFS/tools</userinput></screen>
+<screen><userinput>install -dv $CLFS/tools</userinput></screen>
 
   <para>The next step is to create a <filename class="symlink">/tools</filename>
   symlink on the host system. This will point to the newly-created directory
   on the CLFS partition. Run this command as <systemitem
   class="username">root</systemitem> as well:</para>
 
-<screen><userinput>ln -sv $LFS/tools /</userinput></screen>
+<screen><userinput>ln -sv $CLFS/tools /</userinput></screen>
 
   <note>
     <para>The above command is correct. The <command>ln</command> command

Modified: trunk/BOOK/final-preps/settingenviron.xml
===================================================================
--- trunk/BOOK/final-preps/settingenviron.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/final-preps/settingenviron.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -55,7 +55,7 @@
   be used as soon as they are installed. By switching off the hash function,
   the shell will always search the <envar>PATH</envar> when a program is to
   be run. As such, the shell will find the newly compiled tools in
-  <filename class="directory">$LFS/cross-tools</filename> as soon as they are
+  <filename class="directory">$CLFS/cross-tools</filename> as soon as they are
   available without remembering a previous version of the same program in a
   different location.</para>
 

Modified: trunk/BOOK/final-system/common/stripping.xml
===================================================================
--- trunk/BOOK/final-system/common/stripping.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/final-system/common/stripping.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -32,7 +32,7 @@
 
     <para os="e">Then reenter it with:</para>
 
-<screen os="f" role="nodump"><userinput>chroot $LFS /tools/bin/env -i \
+<screen os="f" role="nodump"><userinput>chroot $CLFS /tools/bin/env -i \
     HOME=/root TERM=$TERM PS1='\u:\w\$ ' \
     PATH=/bin:/usr/bin:/sbin:/usr/sbin \
     /tools/bin/bash --login</userinput></screen>

Modified: trunk/BOOK/final-system/multilib/glibc.xml
===================================================================
--- trunk/BOOK/final-system/multilib/glibc.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/final-system/multilib/glibc.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -69,7 +69,7 @@
 <screen os="h"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
     ../glibc-&glibc-version;/configure --prefix=/usr \
     --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
-    --libexecdir=/usr/lib/glibc --host=${LFS_TARGET32}</userinput></screen>
+    --libexecdir=/usr/lib/glibc --host=${CLFS_TARGET32}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"

Modified: trunk/BOOK/final-system/ppc64/glibc.xml
===================================================================
--- trunk/BOOK/final-system/ppc64/glibc.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/final-system/ppc64/glibc.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -77,7 +77,7 @@
 <screen os="h"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
     ../glibc-&glibc-version;/configure --prefix=/usr \
     --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
-    --libexecdir=/usr/lib/glibc --host=${LFS_TARGET32}</userinput></screen>
+    --libexecdir=/usr/lib/glibc --host=${CLFS_TARGET32}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"

Modified: trunk/BOOK/introduction/common/changelog.xml
===================================================================
--- trunk/BOOK/introduction/common/changelog.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/introduction/common/changelog.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -37,6 +37,16 @@
 -->
 
     <listitem>
+      <para>July 1, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Updated the build to use CLFS in variables
+		instead of LFS. Also change /mnt/lfs to /mnt/clfs.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>June 29, 2006</para>
       <itemizedlist>
         <listitem>
@@ -1345,7 +1355,7 @@
       <para>December 14, 2005</para>
       <itemizedlist>
         <listitem>
-          <para>[jim] - Change the LFS_HOST and LFS_TARGET pages to prevent
+          <para>[jim] - Change the CLFS_HOST and CLFS_TARGET pages to prevent
 	  further build issues.</para>
         </listitem>
         <listitem>
@@ -1472,7 +1482,7 @@
           <para>[Matt Darcy] - Updated some of the missing text poritions of the book</para>
 	</listitem>
 	<listitem>
-          <para>[Matt Darcy] - Updated creation of $LFSHOME parameter to a less
+          <para>[Matt Darcy] - Updated creation of $CLFSHOME parameter to a less
                 user error system. This change will will need to be validated by
                 by other devs</para>
         </listitem>

Modified: trunk/BOOK/introduction/sparc64/changelog.xml
===================================================================
--- trunk/BOOK/introduction/sparc64/changelog.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/introduction/sparc64/changelog.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -79,7 +79,7 @@
 	   The full path doesn't need to be specified because our PATH should
 	   be correct at this point and point to /cross-tools first.
 	   Also, we've already set up a variable for AS and LD - no need to
-	   use \${LFS_TARGET}-{as,ld}.</para>
+	   use \${CLFS_TARGET}-{as,ld}.</para>
         </listitem>
       </itemizedlist>
     </listitem>

Modified: trunk/BOOK/introduction/x86_64/changelog.xml
===================================================================
--- trunk/BOOK/introduction/x86_64/changelog.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/introduction/x86_64/changelog.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -89,7 +89,7 @@
       <para>November 2, 2005</para>
       <itemizedlist>
         <listitem>
-          <para>[jim] - Fixed type on kernel page. Had TARGET should of been LFS_TARGET.</para>
+          <para>[jim] - Fixed type on kernel page. Had TARGET should of been CLFS_TARGET.</para>
         </listitem>
       </itemizedlist>
     </listitem>

Modified: trunk/BOOK/materials/common/introduction.xml
===================================================================
--- trunk/BOOK/materials/common/introduction.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/materials/common/introduction.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -29,7 +29,7 @@
   <para>Downloaded packages and patches will need to be stored somewhere
   that is conveniently available throughout the entire build. A working
   directory is also required to unpack the sources and build them.
-  <filename class="directory">$LFS/sources</filename> can be used both
+  <filename class="directory">$CLFS/sources</filename> can be used both
   as the place to store the tarballs and patches and as a working
   directory. By using this directory, the required elements will be
   located on the CLFS partition and will be available during all stages
@@ -39,7 +39,7 @@
   class="username">root</systemitem>, the following command before
   starting the download session:</para>
 
-<screen><userinput>mkdir -v $LFS/sources</userinput></screen>
+<screen><userinput>mkdir -v $CLFS/sources</userinput></screen>
 
   <para>Make this directory writable and sticky. <quote>Sticky</quote>
   means that even if multiple users have write permission on a
@@ -47,6 +47,6 @@
   sticky directory. The following command will enable the write and
   sticky modes:</para>
 
-<screen><userinput>chmod -v a+wt $LFS/sources</userinput></screen>
+<screen><userinput>chmod -v a+wt $CLFS/sources</userinput></screen>
 
 </sect1>

Modified: trunk/BOOK/partitioning/common/mounting.xml
===================================================================
--- trunk/BOOK/partitioning/common/mounting.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/partitioning/common/mounting.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -25,8 +25,8 @@
   <para>Next, create the mount point and mount the CLFS file system by
   running:</para>
 
-<screen><userinput>mkdir -pv $LFS
-mount -v /dev/<replaceable>[xxx]</replaceable> $LFS</userinput></screen>
+<screen><userinput>mkdir -pv $CLFS
+mount -v /dev/<replaceable>[xxx]</replaceable> $CLFS</userinput></screen>
 
   <para>Replace <replaceable>[xxx]</replaceable> with the designation of
   the CLFS partition.</para>
@@ -35,10 +35,10 @@
   class="directory">/</filename> and another for <filename
   class="directory">/usr</filename>), mount them using:</para>
 
-<screen><userinput>mkdir -pv $LFS
-mount -v /dev/<replaceable>[xxx]</replaceable> $LFS
-mkdir -v $LFS/usr
-mount -v /dev/<replaceable>[yyy]</replaceable> $LFS/usr</userinput></screen>
+<screen><userinput>mkdir -pv $CLFS
+mount -v /dev/<replaceable>[xxx]</replaceable> $CLFS
+mkdir -v $CLFS/usr
+mount -v /dev/<replaceable>[yyy]</replaceable> $CLFS/usr</userinput></screen>
 
   <para>Replace <replaceable>[xxx]</replaceable> and
   <replaceable>[yyy]</replaceable> with the appropriate partition

Modified: trunk/BOOK/prologue/common/typography.xml
===================================================================
--- trunk/BOOK/prologue/common/typography.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/prologue/common/typography.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -39,7 +39,7 @@
   community and to external pages. It includes HOWTOs, download locations,
   and websites.</para>
 
-<screen role="nodump"><userinput>cat > $LFS/etc/group << "EOF"
+<screen role="nodump"><userinput>cat > $CLFS/etc/group << "EOF"
 <literal>root:x:0:
 bin:x:1:
 ......</literal>
@@ -47,7 +47,7 @@
 
   <para>This format is used when creating configuration files. The first
   command tells the system to create the file
-  <filename>$LFS/etc/group</filename> from whatever is typed on the
+  <filename>$CLFS/etc/group</filename> from whatever is typed on the
   following lines until the sequence end of file (EOF) is encountered.
   Therefore, this entire section is generally typed as seen.</para>
 

Modified: trunk/BOOK/temp-system/64/binutils.xml
===================================================================
--- trunk/BOOK/temp-system/64/binutils.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/64/binutils.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -44,7 +44,7 @@
 
 <screen os="j"><userinput>CC="${CC} ${BUILD64}" \
      ../binutils-&binutils-version;/configure --prefix=/tools \
-     --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET} \
+     --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
      --disable-nls --enable-shared --enable-64-bit-bfd \
      --disable-multilib</userinput></screen>
 

Modified: trunk/BOOK/temp-system/64/ncurses.xml
===================================================================
--- trunk/BOOK/temp-system/64/ncurses.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/64/ncurses.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -27,8 +27,8 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
-   ./configure --prefix=/tools --with-shared --build=${LFS_HOST} \
-   --host=${LFS_TARGET} --without-debug --without-ada \
+   ./configure --prefix=/tools --with-shared --build=${CLFS_HOST} \
+   --host=${CLFS_TARGET} --without-debug --without-ada \
    --enable-overwrite --with-build-cc=gcc</userinput></screen>
 
     <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	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/common/bash.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -31,7 +31,7 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
 <screen os="h"><userinput>./configure --prefix=/tools \
-    --build=${LFS_HOST} --host=${LFS_TARGET} \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --without-bash-malloc --cache-file=config.cache</userinput></screen>
 
     <variablelist os="ad">

Modified: trunk/BOOK/temp-system/common/binutils.xml
===================================================================
--- trunk/BOOK/temp-system/common/binutils.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/common/binutils.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -43,7 +43,7 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
 <screen os="j"><userinput>../binutils-&binutils-version;/configure --prefix=/tools \
-    --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET} \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
     --disable-nls --enable-shared --disable-multilib</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/temp-system/common/coreutils.xml
===================================================================
--- trunk/BOOK/temp-system/common/coreutils.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/common/coreutils.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -32,7 +32,7 @@
     <para os="bd">Prepare Coreutils for compilation:</para>
 
 <screen os="be"><userinput>./configure --prefix=/tools --cache-file=config.cache \
-    --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="bf">Compile the package:</para>
 

Modified: trunk/BOOK/temp-system/common/diffutils.xml
===================================================================
--- trunk/BOOK/temp-system/common/diffutils.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/common/diffutils.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -25,7 +25,7 @@
     <para os="a">Prepare Diffutils for compilation:</para>
 
 <screen os="b"><userinput>./configure --prefix=/tools \
-     --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+     --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="c">Compile the package:</para>
 

Modified: trunk/BOOK/temp-system/common/findutils.xml
===================================================================
--- trunk/BOOK/temp-system/common/findutils.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/common/findutils.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -32,7 +32,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="ac"><userinput>./configure --prefix=/tools \
-     --build=${LFS_HOST} --host=${LFS_TARGET} \
+     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
      --cache-file=config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/temp-system/common/gawk.xml
===================================================================
--- trunk/BOOK/temp-system/common/gawk.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/common/gawk.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -25,7 +25,7 @@
     <para os="a">Prepare Gawk for compilation:</para>
 
 <screen os="b"><userinput>./configure --prefix=/tools \
-    --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="c">Compile the package:</para>
 

Modified: trunk/BOOK/temp-system/common/gettext.xml
===================================================================
--- trunk/BOOK/temp-system/common/gettext.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/common/gettext.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -31,7 +31,7 @@
     <para os="c">Prepare Gettext for compilation:</para>
 
 <screen os="d"><userinput>./configure --prefix=/tools \
-     --build=${LFS_HOST} --host=${LFS_TARGET} \
+     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
      --disable-shared --cache-file=config.cache</userinput></screen>
 
     <variablelist os="e">

Modified: trunk/BOOK/temp-system/common/grep.xml
===================================================================
--- trunk/BOOK/temp-system/common/grep.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/common/grep.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -27,7 +27,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="ca"><userinput>./configure --prefix=/tools \
-     --build=${LFS_HOST} --host=${LFS_TARGET} \
+     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
      --disable-perl-regexp</userinput></screen>
 
     <variablelist os="cb">

Modified: trunk/BOOK/temp-system/common/gzip.xml
===================================================================
--- trunk/BOOK/temp-system/common/gzip.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/common/gzip.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -26,14 +26,14 @@
     tools:</para>
 
 <screen os="ab"><userinput>cp -v configure{,.orig}
-sed -e "s at nm conftest@${LFS_TARGET}-&@" configure.orig > configure</userinput></screen>
+sed -e "s at nm conftest@${CLFS_TARGET}-&@" configure.orig > configure</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/gzip.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="ac"><userinput>./configure --prefix=/tools \
-     --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+     --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/gzip.xml"

Modified: trunk/BOOK/temp-system/common/introduction.xml
===================================================================
--- trunk/BOOK/temp-system/common/introduction.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/common/introduction.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -18,7 +18,7 @@
 
   <para>The tools in this chapter are cross-compiled using the toolchain in
   /cross-tools and will be installed under the
-  <filename class="directory">$LFS/tools</filename> directory to keep
+  <filename class="directory">$CLFS/tools</filename> directory to keep
   them separate from the files installed in <xref
   linkend="chapter-building-system"/> and the host production directories.
   Since the packages compiled here are temporary, we do not want them to
@@ -27,7 +27,7 @@
   <para>Check one last time that the <envar>LFS</envar> environment
   variable is set up properly:</para>
 
-<screen><userinput>echo $LFS</userinput></screen>
+<screen><userinput>echo $CLFS</userinput></screen>
 
   <para>Make sure the output shows the path to the CLFS partition's mount
   point, which is <filename class="directory">/mnt/lfs</filename>, using

Modified: trunk/BOOK/temp-system/common/make.xml
===================================================================
--- trunk/BOOK/temp-system/common/make.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/common/make.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -27,7 +27,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="aa"><userinput>./configure --prefix=/tools \
-     --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+     --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/make.xml"

Modified: trunk/BOOK/temp-system/common/ncurses.xml
===================================================================
--- trunk/BOOK/temp-system/common/ncurses.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/common/ncurses.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -27,7 +27,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>./configure --prefix=/tools --with-shared \
-    --build=${LFS_HOST} --host=${LFS_TARGET} \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --without-debug --without-ada \
     --enable-overwrite --with-build-cc=gcc</userinput></screen>
 

Modified: trunk/BOOK/temp-system/common/patch.xml
===================================================================
--- trunk/BOOK/temp-system/common/patch.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/common/patch.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -25,7 +25,7 @@
     <para os="a">Prepare Patch for compilation:</para>
 
 <screen os="b"><userinput>./configure --prefix=/tools \
-    --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="c">Compile the package:</para>
 

Modified: trunk/BOOK/temp-system/common/sed.xml
===================================================================
--- trunk/BOOK/temp-system/common/sed.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/common/sed.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -25,7 +25,7 @@
     <para os="a">Prepare Sed for compilation:</para>
 
 <screen os="b"><userinput>./configure --prefix=/tools \
-     --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+     --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="c">Compile the package:</para>
 

Modified: trunk/BOOK/temp-system/common/tar.xml
===================================================================
--- trunk/BOOK/temp-system/common/tar.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/common/tar.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -32,7 +32,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>./configure --prefix=/tools \
-     --build=${LFS_HOST} --host=${LFS_TARGET} \
+     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
      --cache-file=config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/temp-system/common/texinfo.xml
===================================================================
--- trunk/BOOK/temp-system/common/texinfo.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/common/texinfo.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -27,7 +27,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>./configure --prefix=/tools \
-    --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/texinfo.xml"

Modified: trunk/BOOK/temp-system/common/variables.xml
===================================================================
--- trunk/BOOK/temp-system/common/variables.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/common/variables.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -13,13 +13,13 @@
   <para>Setup target-specific variables for the compiler
   and linkers:</para>
 
-<screen><userinput>export CC="${LFS_TARGET}-gcc"
-export CXX="${LFS_TARGET}-g++"
-export AR="${LFS_TARGET}-ar"
-export AS="${LFS_TARGET}-as"
-export RANLIB="${LFS_TARGET}-ranlib"
-export LD="${LFS_TARGET}-ld"
-export STRIP="${LFS_TARGET}-strip"</userinput></screen>
+<screen><userinput>export CC="${CLFS_TARGET}-gcc"
+export CXX="${CLFS_TARGET}-g++"
+export AR="${CLFS_TARGET}-ar"
+export AS="${CLFS_TARGET}-as"
+export RANLIB="${CLFS_TARGET}-ranlib"
+export LD="${CLFS_TARGET}-ld"
+export STRIP="${CLFS_TARGET}-strip"</userinput></screen>
 
   <para>Then add the build variables to <filename>~/.bashrc</filename> to
   prevent issues if you stop and come back later:</para>

Modified: trunk/BOOK/temp-system/mips64/gcc.xml
===================================================================
--- trunk/BOOK/temp-system/mips64/gcc.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/mips64/gcc.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -100,7 +100,7 @@
 
 <screen os="ck"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
     ../gcc-&gcc-version;/configure --prefix=/tools --libdir=/tools/lib64 \
-    --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET} --with-abi=64 \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} --with-abi=64 \
     --with-local-prefix=/tools --enable-long-long --enable-c99 \
     --enable-shared --enable-threads=posix --enable-__cxa_atexit \
     --disable-nls --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>

Modified: trunk/BOOK/temp-system/mips64-64/gcc.xml
===================================================================
--- trunk/BOOK/temp-system/mips64-64/gcc.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/mips64-64/gcc.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -100,7 +100,7 @@
 
 <screen os="ck"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
     ../gcc-&gcc-version;/configure --prefix=/tools --disable-multilib \
-    --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET} \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
     --with-local-prefix=/tools --enable-long-long --with-abi=64 \
     --enable-c99 --enable-shared --enable-threads=posix --enable-__cxa_atexit \
     --disable-nls --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>

Modified: trunk/BOOK/temp-system/multilib/bash.xml
===================================================================
--- trunk/BOOK/temp-system/multilib/bash.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/multilib/bash.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -36,7 +36,7 @@
 
 <screen os="h"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
    ./configure --prefix=/tools \
-   --build=${LFS_HOST} --host=${LFS_TARGET} \
+   --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    --without-bash-malloc --cache-file=config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/temp-system/multilib/binutils.xml
===================================================================
--- trunk/BOOK/temp-system/multilib/binutils.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/multilib/binutils.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -53,7 +53,7 @@
 <screen os="j"><userinput>CC="${CC} ${BUILD64}" \
      ../binutils-&binutils-version;/configure --prefix=/tools \
      --libdir=/tools/lib64 --with-lib-path=/tools/lib \
-     --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET} \
+     --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
      --disable-nls --enable-shared --enable-64-bit-bfd</userinput></screen>
 
     <variablelist os="ea">

Modified: trunk/BOOK/temp-system/multilib/coreutils.xml
===================================================================
--- trunk/BOOK/temp-system/multilib/coreutils.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/multilib/coreutils.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -36,7 +36,7 @@
 
 <screen os="be"><userinput>CC="${CC} ${BUILD64}" \
    ./configure --prefix=/tools --cache-file=config.cache \
-   --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+   --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/coreutils.xml"

Modified: trunk/BOOK/temp-system/multilib/diffutils.xml
===================================================================
--- trunk/BOOK/temp-system/multilib/diffutils.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/multilib/diffutils.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -27,7 +27,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-  --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+  --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/diffutils.xml"

Modified: trunk/BOOK/temp-system/multilib/findutils.xml
===================================================================
--- trunk/BOOK/temp-system/multilib/findutils.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/multilib/findutils.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -35,7 +35,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="ac"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --build=${LFS_HOST} --host=${LFS_TARGET} --cache-file=config.cache</userinput></screen>
+   --build=${CLFS_HOST} --host=${CLFS_TARGET} --cache-file=config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/findutils.xml"

Modified: trunk/BOOK/temp-system/multilib/gawk.xml
===================================================================
--- trunk/BOOK/temp-system/multilib/gawk.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/multilib/gawk.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -28,7 +28,7 @@
 
 <screen os="b"><userinput>CC="${CC} ${BUILD64}" \
    ./configure --prefix=/tools \
-   --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+   --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gawk.xml"

Modified: trunk/BOOK/temp-system/multilib/gettext.xml
===================================================================
--- trunk/BOOK/temp-system/multilib/gettext.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/multilib/gettext.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -36,7 +36,7 @@
 
 <screen os="d"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
    ./configure --prefix=/tools \
-   --build=${LFS_HOST} --host=${LFS_TARGET} --disable-shared \
+   --build=${CLFS_HOST} --host=${CLFS_TARGET} --disable-shared \
    --cache-file=config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/temp-system/multilib/grep.xml
===================================================================
--- trunk/BOOK/temp-system/multilib/grep.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/multilib/grep.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -27,7 +27,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="ca"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --build=${LFS_HOST} --host=${LFS_TARGET} \
+   --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    --disable-perl-regexp</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/temp-system/multilib/gzip.xml
===================================================================
--- trunk/BOOK/temp-system/multilib/gzip.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/multilib/gzip.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -35,7 +35,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="ac"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-  --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+  --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gzip.xml"

Modified: trunk/BOOK/temp-system/multilib/make.xml
===================================================================
--- trunk/BOOK/temp-system/multilib/make.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/multilib/make.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -27,7 +27,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="aa"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+   --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/make.xml"

Modified: trunk/BOOK/temp-system/multilib/ncurses.xml
===================================================================
--- trunk/BOOK/temp-system/multilib/ncurses.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/multilib/ncurses.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -28,7 +28,7 @@
 
 <screen os="b"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
    ./configure --prefix=/tools --with-shared \
-   --build=${LFS_HOST} --host=${LFS_TARGET} \
+   --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    --without-debug --without-ada \
    --enable-overwrite --with-build-cc=gcc \
    --libdir=/tools/lib64</userinput></screen>

Modified: trunk/BOOK/temp-system/multilib/patch.xml
===================================================================
--- trunk/BOOK/temp-system/multilib/patch.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/multilib/patch.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -27,7 +27,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-    --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/patch.xml"

Modified: trunk/BOOK/temp-system/multilib/sed.xml
===================================================================
--- trunk/BOOK/temp-system/multilib/sed.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/multilib/sed.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -27,7 +27,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+   --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/sed.xml"

Modified: trunk/BOOK/temp-system/multilib/tar.xml
===================================================================
--- trunk/BOOK/temp-system/multilib/tar.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/multilib/tar.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -35,7 +35,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --build=${LFS_HOST} --host=${LFS_TARGET} \
+   --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    --cache-file=config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/temp-system/multilib/texinfo.xml
===================================================================
--- trunk/BOOK/temp-system/multilib/texinfo.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/multilib/texinfo.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -27,7 +27,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+   --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/texinfo.xml"

Modified: trunk/BOOK/temp-system/x86/gcc.xml
===================================================================
--- trunk/BOOK/temp-system/x86/gcc.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/x86/gcc.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -88,7 +88,7 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
 <screen os="ck"><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
-    --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET} \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
     --with-local-prefix=/tools --enable-long-long --enable-c99 \
     --enable-shared --enable-threads=posix --enable-__cxa_atexit \
     --disable-nls --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>

Modified: trunk/BOOK/temp-system/x86_64/gcc.xml
===================================================================
--- trunk/BOOK/temp-system/x86_64/gcc.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/x86_64/gcc.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -100,7 +100,7 @@
 
 <screen os="dc"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
     ../gcc-&gcc-version;/configure --prefix=/tools --libdir=/tools/lib64 \
-    --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET} \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
     --with-local-prefix=/tools --enable-long-long --enable-c99 \
     --enable-shared --enable-threads=posix --enable-__cxa_atexit \
     --disable-nls --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>

Modified: trunk/BOOK/temp-system/x86_64-64/gcc.xml
===================================================================
--- trunk/BOOK/temp-system/x86_64-64/gcc.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/temp-system/x86_64-64/gcc.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -100,7 +100,7 @@
 
 <screen os="ck"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
     ../gcc-&gcc-version;/configure --prefix=/tools --disable-multilib \
-    --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET} \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
     --libexecdir=/tools/lib --with-local-prefix=/tools --enable-long-long \
     --enable-c99 --enable-shared --enable-threads=posix --enable-__cxa_atexit \
     --disable-nls --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>

Modified: trunk/BOOK/the-end/reboot.xml
===================================================================
--- trunk/BOOK/the-end/reboot.xml	2006-07-01 20:29:21 UTC (rev 1872)
+++ trunk/BOOK/the-end/reboot.xml	2006-07-01 20:29:29 UTC (rev 1873)
@@ -36,22 +36,22 @@
 
   <para>Then unmount the virtual file systems:</para>
 
-<screen><userinput>umount $LFS/dev/pts
-umount $LFS/dev/shm
-umount $LFS/dev
-umount $LFS/proc
-umount $LFS/sys</userinput></screen>
+<screen><userinput>umount $CLFS/dev/pts
+umount $CLFS/dev/shm
+umount $CLFS/dev
+umount $CLFS/proc
+umount $CLFS/sys</userinput></screen>
 
   <para>Unmount the CLFS file system itself:</para>
 
-<screen><userinput>umount $LFS</userinput></screen>
+<screen><userinput>umount $CLFS</userinput></screen>
 
   <para>If multiple partitions were created, unmount the other
   partitions before unmounting the main one, like this:</para>
 
-<screen><userinput>umount $LFS/usr
-umount $LFS/home
-umount $LFS</userinput></screen>
+<screen><userinput>umount $CLFS/usr
+umount $CLFS/home
+umount $CLFS</userinput></screen>
 
   <para>Now, reboot the system with:</para>
 




More information about the cross-lfs mailing list