From efcb3933433838b71f3a4a53ec1ac6d899aaec0b Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pieere@linuxfromscratch.org>
Date: Sun, 3 May 2020 21:02:51 +0000
Subject: Make the new book

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/cross-chap5@11831 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter05/make.xml | 29 ++++-------------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

(limited to 'chapter05/make.xml')

diff --git a/chapter05/make.xml b/chapter05/make.xml
index 205ae5f15..5f895c49d 100644
--- a/chapter05/make.xml
+++ b/chapter05/make.xml
@@ -41,41 +41,20 @@
 
   <sect2 role="installation">
     <title>Installation of Make</title>
-<!--
-    <para>First, work around an error caused by glibc-2.27 and later:</para>
 
-<screen><userinput remap="pre">sed -i '211,217 d; 219,229 d; 232 d' glob/glob.c</userinput></screen>
--->
     <para>Prepare Make for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/tools --without-guile</userinput></screen>
-
-    <variablelist>
-      <title>The meaning of the configure option:</title>
-
-      <varlistentry>
-        <term><parameter>--without-guile</parameter></term>
-        <listitem>
-          <para>This ensures that Make-&make-version; won't link against Guile libraries, which
-          may be present on the host system, but won't be available within the
-          <command>chroot</command> environment in the next chapter.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
+<screen><userinput remap="configure">./configure --prefix=/usr   \
+            --host=$LFS_TGT \
+            --build=$(build-aux/config.guess)</userinput></screen>
 
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>Compilation is now complete. As discussed earlier, running the test
-    suite is not mandatory for the temporary tools here in this chapter. To run
-    the Make test suite anyway, issue the following command:</para>
-
-<screen><userinput remap="test">make check</userinput></screen>
-
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make install</userinput></screen>
+<screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
 
   </sect2>
 
-- 
cgit v1.2.3-54-g00ecf