source: BOOK/final-system/common/diffutils.xml@ 399bd3b

<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
  <!ENTITY % general-entities SYSTEM "../../general.ent">
  %general-entities;
]>

<sect1 id="ch-system-diffutils" role="wrap">
  <?dbhtml filename="diffutils.html"?>

  <title>Diffutils-&diffutils-version;</title>

  <indexterm zone="ch-system-diffutils">
    <primary sortas="a-Diffutils">Diffutils</primary>
  </indexterm>

  <sect2 role="package">
    <title/>

    <para>The Diffutils package contains programs that show the differences
    between files or directories.</para>

  </sect2>

  <sect2 role="installation">
    <title>Installation of Diffutils</title>

    <para os="s1">Fix a bug that prevents locale files from being installed:</para>

<screen os="s2"><userinput>sed -i 's:= @mkdir_p@:= /bin/mkdir -p:' po/Makefile.in.in</userinput></screen>

    <para os="s3">Adjust the source to build with the included GNULIB code:"</para>
<screen os="s4"><userinput>sed -i '233,237 s/max)/max) \\/' lib/intprops.h</userinput></screen>

    <para os="a">Prepare Diffutils for compilation:</para>

<screen os="b"><userinput>./configure \
    --prefix=/usr</userinput></screen>

    <para os="s5">Diffutils wants <command>ed</command> as the default editor
    for <command>sdiff</command>. The following <command>sed</command> will
    change the default to <command>vi</command>:</para>

<screen os="s6"><userinput>sed -i 's@\(^#define DEFAULT_EDITOR_PROGRAM \).*@\1"vi"@' lib/config.h</userinput></screen>
    <para os="c">Compile the package:</para>

<screen os="d"><userinput>make</userinput></screen>

    <para os="e">To test the results, issue:</para>

<screen os="e2"><userinput remap="test">make check</userinput></screen>

    <para os="f">Install the package:</para>

<screen os="g"><userinput>make install</userinput></screen>

  </sect2>

  <sect2 id="contents-diffutils" role="content">
    <title>Contents of Diffutils</title>

    <segmentedlist>
      <segtitle>Installed programs</segtitle>

      <seglistitem>
        <seg>cmp, diff, diff3, 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>

  </sect2>

</sect1>