Index: chapter01/changelog.xml
===================================================================
--- chapter01/changelog.xml	(revision b6ceddb32a419bf697725d60fd0140a630c19fc0)
+++ chapter01/changelog.xml	(revision dd30a4b8ace26469eb24beaf9a0c4cf3af5091df)
@@ -38,4 +38,15 @@
 
     <listitem>
+      <para>2016-01-28</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Move external build directories into 
+          dedicated build directories inside the source tree for 
+          binutils, gcc, and glibc - Merged from trunk.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2016-01-24</para>
       <itemizedlist>
Index: chapter05/binutils-pass1.xml
===================================================================
--- chapter05/binutils-pass1.xml	(revision b6ceddb32a419bf697725d60fd0140a630c19fc0)
+++ chapter05/binutils-pass1.xml	(revision dd30a4b8ace26469eb24beaf9a0c4cf3af5091df)
@@ -53,9 +53,9 @@
     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>
@@ -73,11 +73,10 @@
     <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>
Index: chapter05/binutils-pass2.xml
===================================================================
--- chapter05/binutils-pass2.xml	(revision b6ceddb32a419bf697725d60fd0140a630c19fc0)
+++ chapter05/binutils-pass2.xml	(revision dd30a4b8ace26469eb24beaf9a0c4cf3af5091df)
@@ -46,6 +46,6 @@
     <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>
@@ -54,5 +54,5 @@
 AR=$LFS_TGT-ar                 \
 RANLIB=$LFS_TGT-ranlib         \
-../binutils-&binutils-version;/configure     \
+../configure                   \
     --prefix=/tools            \
     --disable-nls              \
Index: chapter05/gcc-pass1.xml
===================================================================
--- chapter05/gcc-pass1.xml	(revision b6ceddb32a419bf697725d60fd0140a630c19fc0)
+++ chapter05/gcc-pass1.xml	(revision dd30a4b8ace26469eb24beaf9a0c4cf3af5091df)
@@ -112,13 +112,13 @@
 <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>
-
-<screen><userinput remap="pre">mkdir -v ../gcc-build
-cd ../gcc-build</userinput></screen>
+    <para>The GCC documentation recommends building GCC 
+    in a dedicated build directory:</para>
+
+<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                                \
Index: chapter05/gcc-pass2.xml
===================================================================
--- chapter05/gcc-pass2.xml	(revision b6ceddb32a419bf697725d60fd0140a630c19fc0)
+++ chapter05/gcc-pass2.xml	(revision dd30a4b8ace26469eb24beaf9a0c4cf3af5091df)
@@ -102,6 +102,6 @@
     <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
@@ -114,5 +114,5 @@
 AR=$LFS_TGT-ar                                     \
 RANLIB=$LFS_TGT-ranlib                             \
-../gcc-&gcc-version;/configure                             \
+../configure                                       \
     --prefix=/tools                                \
     --with-local-prefix=/tools                     \
Index: chapter05/generalinstructions.xml
===================================================================
--- chapter05/generalinstructions.xml	(revision b6ceddb32a419bf697725d60fd0140a630c19fc0)
+++ chapter05/generalinstructions.xml	(revision dd30a4b8ace26469eb24beaf9a0c4cf3af5091df)
@@ -108,7 +108,5 @@
             </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>
Index: chapter05/glibc.xml
===================================================================
--- chapter05/glibc.xml	(revision b6ceddb32a419bf697725d60fd0140a630c19fc0)
+++ chapter05/glibc.xml	(revision dd30a4b8ace26469eb24beaf9a0c4cf3af5091df)
@@ -48,13 +48,13 @@
 <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>
-
-<screen><userinput remap="pre">mkdir -v ../glibc-build
-cd ../glibc-build</userinput></screen>
+    <para>The Glibc documentation recommends building Glibc 
+    in a dedicated build directory:</para>
+
+<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                               \
Index: chapter05/libstdc++.xml
===================================================================
--- chapter05/libstdc++.xml	(revision b6ceddb32a419bf697725d60fd0140a630c19fc0)
+++ chapter05/libstdc++.xml	(revision dd30a4b8ace26469eb24beaf9a0c4cf3af5091df)
@@ -49,12 +49,12 @@
     </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                 \
Index: chapter06/binutils.xml
===================================================================
--- chapter06/binutils.xml	(revision b6ceddb32a419bf697725d60fd0140a630c19fc0)
+++ chapter06/binutils.xml	(revision dd30a4b8ace26469eb24beaf9a0c4cf3af5091df)
@@ -66,15 +66,15 @@
 <screen><userinput remap="pre">patch -Np1 -i ../&binutils-multiple-plugins-patch;</userinput></screen>
 -->
-    <para>The Binutils documentation recommends building Binutils outside of the
-    source directory in a dedicated build directory:</para>
-
-<screen><userinput remap="pre">mkdir -v ../binutils-build
-cd ../binutils-build</userinput></screen>
+    <para>The Binutils documentation recommends building Binutils 
+    in a dedicated build directory:</para>
+
+<screen><userinput remap="pre">mkdir -v build
+cd       build</userinput></screen>
 
     <para>Prepare Binutils for compilation:</para>
 
-<screen><userinput remap="configure">../binutils-&binutils-version;/configure --prefix=/usr   \
-                           --enable-shared \
-                           --disable-werror</userinput></screen>
+<screen><userinput remap="configure">../configure --prefix=/usr   \
+             --enable-shared \
+             --disable-werror</userinput></screen>
 
     <para>Compile the package:</para>
Index: chapter06/gcc.xml
===================================================================
--- chapter06/gcc.xml	(revision b6ceddb32a419bf697725d60fd0140a630c19fc0)
+++ chapter06/gcc.xml	(revision dd30a4b8ace26469eb24beaf9a0c4cf3af5091df)
@@ -46,19 +46,17 @@
 <screen><userinput remap="pre">patch -Np1 -i ../&gcc-upstream-patch;</userinput></screen>
 -->
-    <para>The GCC documentation recommends building GCC outside of the source
-    directory in a dedicated build directory:</para>
-
-<screen><userinput remap="pre">mkdir -v ../gcc-build
-cd ../gcc-build</userinput></screen>
+    <para>The GCC documentation recommends building GCC in a dedicated build directory:</para>
+
+<screen><userinput remap="pre">mkdir -v build
+cd       build</userinput></screen>
 
     <para>Prepare GCC for compilation:</para>
 
-<screen><userinput remap="configure">SED=sed                       \
-../gcc-&gcc-version;/configure        \
-     --prefix=/usr            \
-     --enable-languages=c,c++ \
-     --disable-multilib       \
-     --disable-bootstrap      \
-     --with-system-zlib</userinput></screen>
+<screen><userinput remap="configure">SED=sed                               \
+../configure --prefix=/usr            \
+             --enable-languages=c,c++ \
+             --disable-multilib       \
+             --disable-bootstrap      \
+             --with-system-zlib</userinput></screen>
 
     <para>Note that for other languages, there are some prerequisites that
@@ -107,5 +105,5 @@
     <para>To receive a summary of the test suite results, run:</para>
 
-<screen><userinput remap="test">../gcc-&gcc-version;/contrib/test_summary</userinput></screen>
+<screen><userinput remap="test">../contrib/test_summary</userinput></screen>
 
     <para>For only the summaries, pipe the output through
Index: chapter06/glibc.xml
===================================================================
--- chapter06/glibc.xml	(revision b6ceddb32a419bf697725d60fd0140a630c19fc0)
+++ chapter06/glibc.xml	(revision dd30a4b8ace26469eb24beaf9a0c4cf3af5091df)
@@ -76,17 +76,16 @@
 <screen><userinput remap="pre">patch -Np1 -i ../&glibc-largefile-patch;</userinput></screen>
 
-    <para>The Glibc documentation recommends building Glibc outside of the source
-    directory in a dedicated build directory:</para>
-
-<screen><userinput remap="pre">mkdir -v ../glibc-build
-cd ../glibc-build</userinput></screen>
+    <para>The Glibc documentation recommends building Glibc 
+    in a dedicated build directory:</para>
+
+<screen><userinput remap="pre">mkdir -v build
+cd       build</userinput></screen>
 
     <para>Prepare Glibc for compilation:</para>
 
-<screen><userinput remap="configure">../glibc-&glibc-version;/configure    \
-    --prefix=/usr          \
-    --disable-profile      \
-    --enable-kernel=&min-kernel; \
-    --enable-obsolete-rpc</userinput></screen>
+<screen><userinput remap="configure">../configure --prefix=/usr          \
+             --disable-profile      \
+             --enable-kernel=&min-kernel; \
+             --enable-obsolete-rpc</userinput></screen>
 
     <para>Compile the package:</para>
@@ -169,5 +168,5 @@
     <command>nscd</command>:</para>
 
-<screen><userinput remap="install">cp -v ../glibc-&glibc-version;/nscd/nscd.conf /etc/nscd.conf
+<screen><userinput remap="install">cp -v ../nscd/nscd.conf /etc/nscd.conf
 mkdir -pv /var/cache/nscd</userinput></screen>
 
@@ -278,5 +277,5 @@
 
     <para>Install and set up the time zone data with the following:</para>
-<screen><userinput>tar -xf ../tzdata&tzdata-version;.tar.gz
+<screen><userinput>tar -xf ../../tzdata&tzdata-version;.tar.gz
 
 ZONEINFO=/usr/share/zoneinfo
Index: general.ent
===================================================================
--- general.ent	(revision b6ceddb32a419bf697725d60fd0140a630c19fc0)
+++ general.ent	(revision dd30a4b8ace26469eb24beaf9a0c4cf3af5091df)
@@ -1,5 +1,5 @@
-<!ENTITY version         "20160125-systemd">
+<!ENTITY version         "20160128-systemd">
 <!ENTITY short-version   "systemd">  <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate     "January 25, 2016">
+<!ENTITY releasedate     "January 28, 2016">
 <!ENTITY copyrightdate   "1999-2016"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.9">
