aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06
diff options
context:
space:
mode:
Diffstat (limited to 'chapter06')
-rw-r--r--chapter06/binutils.xml14
-rw-r--r--chapter06/gcc.xml22
-rw-r--r--chapter06/glibc.xml21
3 files changed, 27 insertions, 30 deletions
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index c41d62289..fb9dc4b31 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -65,17 +65,17 @@ Ask your system administrator to create more.</computeroutput></screen>
<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>
+ <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>
<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>
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index afae54041..1be390ab4 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -45,21 +45,19 @@
<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>
+ <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">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
are not yet available. See the
@@ -106,7 +104,7 @@ cd ../gcc-build</userinput></screen>
<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
<userinput>grep -A7 Summ</userinput>.</para>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 1cbaf232a..a78d81ee7 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -77,19 +77,18 @@
<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>
+ <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>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>
@@ -170,7 +169,7 @@ cd ../glibc-build</userinput></screen>
<para>Install the configuration file and runtime directory for
<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>
<para>The locales that can make the system respond in a different language
@@ -274,7 +273,7 @@ EOF</userinput></screen>
<title>Adding time zone data</title>
<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
mkdir -pv $ZONEINFO/{posix,right}