Move external build directories into dedicated build directories inside the

source tree for binutils, gcc, and glibc.



git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10991 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

7 files changed, 31 insertions, 34 deletions

diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml
index decec8b6f..ec3861eea 100644
--- a/chapter05/binutils-pass1.xml
+++ b/chapter05/binutils-pass1.xml
@@ -52,11 +52,11 @@
     linker and assembler to determine which of their own features to
     enable.</para>
 
-    <para>The Binutils documentation recommends building Binutils outside of the
-    source directory in a dedicated build directory:</para>
+    <para>The Binutils documentation recommends building Binutils 
+    in a dedicated build directory:</para>
 
-<screen><userinput remap="pre">mkdir -v ../binutils-build
-cd ../binutils-build</userinput></screen>
+<screen><userinput remap="pre">mkdir -v build
+cd       build</userinput></screen>
 
     <note>
       <para>In order for the SBU values listed in the rest of the book
@@ -72,13 +72,12 @@ cd ../binutils-build</userinput></screen>
 
     <para>Now prepare Binutils for compilation:</para>
 
-<screen><userinput remap="configure">../binutils-&binutils-version;/configure     \
-    --prefix=/tools            \
-    --with-sysroot=$LFS        \
-    --with-lib-path=/tools/lib \
-    --target=$LFS_TGT          \
-    --disable-nls              \
-    --disable-werror</userinput></screen>
+<screen><userinput remap="configure">../configure --prefix=/tools            \
+             --with-sysroot=$LFS        \
+             --with-lib-path=/tools/lib \
+             --target=$LFS_TGT          \
+             --disable-nls              \
+             --disable-werror</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml
index 182fad342..080c50916 100644
--- a/chapter05/binutils-pass2.xml
+++ b/chapter05/binutils-pass2.xml
@@ -45,15 +45,15 @@
 
     <para>Create a separate build directory again:</para>
 
-<screen><userinput remap="pre">mkdir -v ../binutils-build
-cd ../binutils-build</userinput></screen>
+<screen><userinput remap="pre">mkdir -v build
+cd       build</userinput></screen>
 
     <para>Prepare Binutils for compilation:</para>
 
 <screen><userinput remap="configure">CC=$LFS_TGT-gcc                \
 AR=$LFS_TGT-ar                 \
 RANLIB=$LFS_TGT-ranlib         \
-../binutils-&binutils-version;/configure     \
+../configure                   \
     --prefix=/tools            \
     --disable-nls              \
     --disable-werror           \
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index da6ea0743..8015c1b50 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -111,15 +111,15 @@ done</userinput></screen>
 
 <screen><userinput remap="pre">sed -i 's/if \((code.*))\)/if (\1 \&amp;\&amp; \!DEBUG_INSN_P (insn))/' gcc/sched-deps.c</userinput></screen>
 -->
-    <para>The GCC documentation recommends building GCC outside of the
-    source directory in a dedicated build directory:</para>
+    <para>The GCC documentation recommends building GCC 
+    in a dedicated build directory:</para>
 
-<screen><userinput remap="pre">mkdir -v ../gcc-build
-cd ../gcc-build</userinput></screen>
+<screen><userinput remap="pre">mkdir -v build
+cd       build</userinput></screen>
 
     <para>Prepare GCC for compilation:</para>
 
-<screen><userinput remap="configure">../gcc-&gcc-version;/configure                             \
+<screen><userinput remap="configure">../configure                                       \
     --target=$LFS_TGT                              \
     --prefix=/tools                                \
     --with-glibc-version=2.11                      \
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index ec460e482..a8844ed7d 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -101,8 +101,8 @@ mv -v mpc-&mpc-version; mpc</userinput></screen>
 -->
     <para>Create a separate build directory again:</para>
 
-<screen><userinput remap="pre">mkdir -v ../gcc-build
-cd ../gcc-build</userinput></screen>
+<screen><userinput remap="pre">mkdir -v build
+cd       build</userinput></screen>
 
     <para>Before starting to build GCC, remember to unset any environment
     variables that override the default optimization flags.</para>
@@ -113,7 +113,7 @@ cd ../gcc-build</userinput></screen>
 CXX=$LFS_TGT-g++                                   \
 AR=$LFS_TGT-ar                                     \
 RANLIB=$LFS_TGT-ranlib                             \
-../gcc-&gcc-version;/configure                             \
+../configure                                       \
     --prefix=/tools                                \
     --with-local-prefix=/tools                     \
     --with-native-system-header-dir=/tools/include \
diff --git a/chapter05/generalinstructions.xml b/chapter05/generalinstructions.xml
index 72f460066..d2f5d61af 100644
--- a/chapter05/generalinstructions.xml
+++ b/chapter05/generalinstructions.xml
@@ -107,9 +107,7 @@
               <para>Change back to the sources directory.</para>
             </listitem>
             <listitem>
-              <para>Delete the extracted source directory and any
-              <filename class="directory"><replaceable>&lt;package&gt;</replaceable>-build</filename>
-              directories that were created in the build process unless instructed otherwise.</para>
+              <para>Delete the extracted source directory unless instructed otherwise.</para>
             </listitem>
           </orderedlist>
         </listitem>
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 61e2d965c..a7278e337 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -47,15 +47,15 @@
 
 <screen><userinput remap="pre">patch -Np1 -i ../&glibc-upstream-patch;</userinput></screen>
 
-    <para>The Glibc documentation recommends building Glibc outside of the source
-    directory in a dedicated build directory:</para>
+    <para>The Glibc documentation recommends building Glibc 
+    in a dedicated build directory:</para>
 
-<screen><userinput remap="pre">mkdir -v ../glibc-build
-cd ../glibc-build</userinput></screen>
+<screen><userinput remap="pre">mkdir -v build
+cd       build</userinput></screen>
 
     <para>Next, prepare Glibc for compilation:</para>
 
-<screen><userinput remap="configure">../glibc-&glibc-version;/configure                             \
+<screen><userinput remap="configure">../configure                                        \
       --prefix=/tools                               \
       --host=$LFS_TGT                               \
       --build=$(../glibc-&glibc-version;/scripts/config.guess) \
diff --git a/chapter05/libstdc++.xml b/chapter05/libstdc++.xml
index 365babb3a..f3ac79de6 100644
--- a/chapter05/libstdc++.xml
+++ b/chapter05/libstdc++.xml
@@ -48,14 +48,14 @@
       <filename>gcc-&gcc-version;</filename> directory.</para>
     </note>
 
-    <para>Create a directory for Libstdc++ and enter it:</para>
+    <para>Create a separate build directory for Libstdc++ and enter it:</para>
 
-<screen><userinput remap="pre">mkdir -v ../gcc-build
-cd ../gcc-build</userinput></screen>
+<screen><userinput remap="pre">mkdir -v build
+cd       build</userinput></screen>
 
     <para>Prepare Libstdc++ for compilation:</para>
 
-<screen><userinput remap="configure">../gcc-&gcc-version;/libstdc++-v3/configure \
+<screen><userinput remap="configure">../libstdc++-v3/configure           \
     --host=$LFS_TGT                 \
     --prefix=/tools                 \
     --disable-multilib              \