Changeset 37e35d2 for chapter06/make.xml

Timestamp:

06/29/2020 07:55:01 AM (4 years ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib-10.1

Children:

c4804e8

Parents:

d4fdde6

Message:

Update to new lfs structure

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/multilib@11986 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

File:

• chapter06/make.xml (modified) (6 diffs)

chapter06/make.xml

@@ -5 +5 @@
   %general-entities;
 ]>
-
-<sect1 id="ch-system-make" role="wrap">
+<sect1 id="ch-tools-make" role="wrap">
   <?dbhtml filename="make.html"?>
 
@@ -17 +16 @@
   <title>Make-&make-version;</title>
 
-  <indexterm zone="ch-system-make">
+  <indexterm zone="ch-tools-make">
     <primary sortas="a-Make">Make</primary>
+    <secondary>tools</secondary>
   </indexterm>
 
@@ -24 +24 @@
     <title/>
 
-    <para>The Make package contains a program for compiling packages.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../chapter08/make.xml"
+    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
     <segmentedlist>
@@ -31 +33 @@
 
       <seglistitem>
-        <seg>&make-ch6-sbu;</seg>
-        <seg>&make-ch6-du;</seg>
+        <seg>&make-tmp-sbu;</seg>
+        <seg>&make-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
@@ -40 +42 @@
   <sect2 role="installation">
     <title>Installation of Make</title>
-<!--
-    <para>Again, 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=/usr</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr   \
+            --without-guile \
+            --host=$LFS_TGT \
+            --build=$(build-aux/config.guess)</userinput></screen>
+
+    <variablelist>
+      <title>The meaning of the new configure option:</title>
+
+      <varlistentry>
+        <term><parameter>--without-guile</parameter></term>
+        <listitem>
+          <para>Although we are cross-compiling, configure tries to use
+          guile from the build host if it finds it. This makes compilation
+          fail, so this switch prevents using it.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
 
     <para>Compile the package:</para>
@@ -53 +67 @@
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>The test suite needs to know where supporting perl files are located.
-    We use an environment variable to accomplish this.  To test the 
-    results, issue:</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>
 
+  <sect2 role="content">
+    <title/>
 
-  <sect2 id="contents-make" role="content">
-    <title>Contents of Make</title>
-
-    <segmentedlist>
-      <segtitle>Installed program</segtitle>
-
-      <seglistitem>
-        <seg>make</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="make">
-        <term><command>make</command></term>
-        <listitem>
-          <para>Automatically determines which pieces of a package need to
-          be (re)compiled and then issues the relevant commands</para>
-          <indexterm zone="ch-system-make make">
-            <primary sortas="b-make">make</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
+    <para>Details on this package are located in
+    <xref linkend="contents-make" role="."/></para>
 
   </sect2>