Changeset 37e35d2 for chapter08/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:

• chapter08/make.xml (moved) (moved from chapter05/make.xml ) (8 diffs)

chapter08/make.xml

@@ -5 +5 @@
   %general-entities;
 ]>
-<sect1 id="ch-tools-make" role="wrap">
+
+<sect1 id="ch-system-make" role="wrap">
   <?dbhtml filename="make.html"?>
 
@@ -16 +17 @@
   <title>Make-&make-version;</title>
 
-  <indexterm zone="ch-tools-make">
+  <indexterm zone="ch-system-make">
     <primary sortas="a-Make">Make</primary>
-    <secondary>tools</secondary>
   </indexterm>
 
@@ -24 +24 @@
     <title/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../chapter06/make.xml"
-    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
+    <para>The Make package contains a program for controlling the generation of
+    executables and other non-source files of a package from source files.</para>
 
     <segmentedlist>
@@ -33 +32 @@
 
       <seglistitem>
-        <seg>&make-ch5-sbu;</seg>
-        <seg>&make-ch5-du;</seg>
+        <seg>&make-fin-sbu;</seg>
+        <seg>&make-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
@@ -43 +42 @@
     <title>Installation of Make</title>
 <!--
-    <para>First, work around an error caused by glibc-2.27 and later:</para>
+    <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>
@@ -49 +48 @@
     <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</userinput></screen>
 
     <para>Compile the package:</para>
@@ -68 +54 @@
 <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>
+    <para>To test the results, issue:</para>
 
 <screen><userinput remap="test">make check</userinput></screen>
@@ -80 +64 @@
   </sect2>
 
-  <sect2 role="content">
-    <title/>
 
-    <para>Details on this package are located in
-    <xref linkend="contents-make" role="."/></para>
+  <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>
 
   </sect2>