aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06/diffutils.xml
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2020-06-07 20:16:00 +0000
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2020-06-07 20:16:00 +0000
commitfcc027677da55c41dcaea045f5b9ff8b088e6495 (patch)
tree42500a7858959695b971e7f28f1d0bf33185db2e /chapter06/diffutils.xml
parentd53fefab5a6772fef606392a61608fc290e6a7ae (diff)
Initial commit of alternative cross LFS
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/cross2@11897 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter06/diffutils.xml')
-rw-r--r--chapter06/diffutils.xml85
1 files changed, 14 insertions, 71 deletions
diff --git a/chapter06/diffutils.xml b/chapter06/diffutils.xml
index 0d8bd5c77..6594058be 100644
--- a/chapter06/diffutils.xml
+++ b/chapter06/diffutils.xml
@@ -5,7 +5,7 @@
%general-entities;
]>
-<sect1 id="ch-system-diffutils" role="wrap">
+<sect1 id="ch-tools-diffutils" role="wrap">
<?dbhtml filename="diffutils.html"?>
<sect1info condition="script">
@@ -16,23 +16,25 @@
<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>
<sect2 role="package">
<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>
<segtitle>&buildtime;</segtitle>
<segtitle>&diskspace;</segtitle>
<seglistitem>
- <seg>&diffutils-ch6-sbu;</seg>
- <seg>&diffutils-ch6-du;</seg>
+ <seg>&diffutils-ch5-sbu;</seg>
+ <seg>&diffutils-ch5-du;</seg>
</seglistitem>
</segmentedlist>
@@ -43,82 +45,23 @@
<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>
<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>