Changeset fcc02767 for chapter06/diffutils.xml

Timestamp:

06/07/2020 08:16:00 PM (4 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

595ff03

Parents:

d53fefa

Message:

Initial commit of alternative cross LFS

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

File:

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

chapter06/diffutils.xml

@@ -6 +6 @@
 ]>
 
-<sect1 id="ch-system-diffutils" role="wrap">
+<sect1 id="ch-tools-diffutils" role="wrap">
   <?dbhtml filename="diffutils.html"?>
 
@@ -17 +17 @@
   <title>Diffutils-&diffutils-version;</title>
 
-  <indexterm zone="ch-system-diffutils">
+  <indexterm zone="ch-tools-diffutils">
     <primary sortas="a-Diffutils">Diffutils</primary>
+    <secondary>tools</secondary>
   </indexterm>
 
@@ -24 +25 @@
     <title/>
 
-    <para>The Diffutils package contains programs that show the differences
-    between files or directories.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../chapter08/diffutils.xml"
+    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
     <segmentedlist>
@@ -32 +34 @@
 
       <seglistitem>
-        <seg>&diffutils-ch6-sbu;</seg>
-        <seg>&diffutils-ch6-du;</seg>
+        <seg>&diffutils-ch5-sbu;</seg>
+        <seg>&diffutils-ch5-du;</seg>
       </seglistitem>
     </segmentedlist>
@@ -44 +46 @@
     <para>Prepare Diffutils for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --host=$LFS_TGT</userinput></screen>
 
     <para>Compile the package:</para>
@@ -50 +52 @@
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>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-diffutils" role="content">
-    <title>Contents of Diffutils</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>cmp, diff, diff3, and sdiff</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cmp">
-        <term><command>cmp</command></term>
-        <listitem>
-          <para>Compares two files and reports whether or in which bytes they
-          differ</para>
-          <indexterm zone="ch-system-diffutils cmp">
-            <primary sortas="b-cmp">cmp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="diff">
-        <term><command>diff</command></term>
-        <listitem>
-          <para>Compares two files or directories and reports which lines in
-          the files differ</para>
-          <indexterm zone="ch-system-diffutils diff">
-            <primary sortas="b-diff">diff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="diff3">
-        <term><command>diff3</command></term>
-        <listitem>
-            <para>Compares three files line by line</para>
-            <indexterm zone="ch-system-diffutils diff3">
-              <primary sortas="b-diff3">diff3</primary>
-            </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sdiff">
-        <term><command>sdiff</command></term>
-        <listitem>
-          <para>Merges two files and interactively outputs the results</para>
-          <indexterm zone="ch-system-diffutils sdiff">
-            <primary sortas="b-sdiff">sdiff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
+    <para>Details on this package are located in
+    <xref linkend="contents-diffutils" role="."/></para>
 
   </sect2>