[3f8be484] | 1 | <?xml version="1.0" encoding="ISO-8859-1"?>
|
---|
[aa18ac0] | 2 | <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
|
---|
| 3 | "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
|
---|
[3f8be484] | 4 | <!ENTITY % general-entities SYSTEM "../../general.ent">
|
---|
| 5 | %general-entities;
|
---|
| 6 | ]>
|
---|
| 7 |
|
---|
| 8 | <sect1 id="ch-system-diffutils" role="wrap">
|
---|
| 9 | <?dbhtml filename="diffutils.html"?>
|
---|
| 10 |
|
---|
| 11 | <title>Diffutils-&diffutils-version;</title>
|
---|
| 12 |
|
---|
| 13 | <indexterm zone="ch-system-diffutils">
|
---|
| 14 | <primary sortas="a-Diffutils">Diffutils</primary>
|
---|
| 15 | </indexterm>
|
---|
| 16 |
|
---|
| 17 | <sect2 role="package">
|
---|
| 18 | <title/>
|
---|
| 19 |
|
---|
| 20 | <para>The Diffutils package contains programs that show the differences
|
---|
| 21 | between files or directories.</para>
|
---|
| 22 |
|
---|
| 23 | </sect2>
|
---|
| 24 |
|
---|
| 25 | <sect2 role="installation">
|
---|
| 26 | <title>Installation of Diffutils</title>
|
---|
| 27 |
|
---|
[bde571b] | 28 | <para os="s1">Fix a bug that prevents locale files from being installed:</para>
|
---|
[09465d6] | 29 |
|
---|
| 30 | <screen os="s2"><userinput>sed -i 's:= @mkdir_p@:= /bin/mkdir -p:' po/Makefile.in.in</userinput></screen>
|
---|
| 31 |
|
---|
[e0e40d3] | 32 | <para os="a">Prepare Diffutils for compilation:</para>
|
---|
[3f8be484] | 33 |
|
---|
[7cd7f99] | 34 | <screen os="b"><userinput>./configure \
|
---|
| 35 | --prefix=/usr</userinput></screen>
|
---|
[3f8be484] | 36 |
|
---|
[d3d34af] | 37 | <para os="s3">Diffutils wants <command>ed</command> as the default editor
|
---|
| 38 | for <command>sdiff</command>. The following <command>sed</command> will
|
---|
| 39 | change the default to <command>vi</command>:</para>
|
---|
[6a5fd75] | 40 |
|
---|
[1bcea75] | 41 | <screen os="s4"><userinput>sed -i 's@\(^#define DEFAULT_EDITOR_PROGRAM \).*@\1"vi"@' lib/config.h</userinput></screen>
|
---|
[bf252b7] | 42 |
|
---|
[e0e40d3] | 43 | <para os="c">Compile the package:</para>
|
---|
[3f8be484] | 44 |
|
---|
[e0e40d3] | 45 | <screen os="d"><userinput>make</userinput></screen>
|
---|
[3f8be484] | 46 |
|
---|
[686839b] | 47 | <para os="e">To test the results, issue:</para>
|
---|
| 48 |
|
---|
| 49 | <screen os="e2"><userinput remap="test">make check</userinput></screen>
|
---|
[3f8be484] | 50 |
|
---|
[e0e40d3] | 51 | <para os="f">Install the package:</para>
|
---|
[3f8be484] | 52 |
|
---|
[e0e40d3] | 53 | <screen os="g"><userinput>make install</userinput></screen>
|
---|
[3f8be484] | 54 |
|
---|
| 55 | </sect2>
|
---|
| 56 |
|
---|
| 57 | <sect2 id="contents-diffutils" role="content">
|
---|
| 58 | <title>Contents of Diffutils</title>
|
---|
| 59 |
|
---|
| 60 | <segmentedlist>
|
---|
| 61 | <segtitle>Installed programs</segtitle>
|
---|
| 62 |
|
---|
| 63 | <seglistitem>
|
---|
[f698055a] | 64 | <seg>cmp, diff, diff3, sdiff</seg>
|
---|
[3f8be484] | 65 | </seglistitem>
|
---|
| 66 | </segmentedlist>
|
---|
| 67 |
|
---|
| 68 | <variablelist>
|
---|
| 69 | <bridgehead renderas="sect3">Short Descriptions</bridgehead>
|
---|
| 70 | <?dbfo list-presentation="list"?>
|
---|
| 71 | <?dbhtml list-presentation="table"?>
|
---|
| 72 |
|
---|
| 73 | <varlistentry id="cmp">
|
---|
| 74 | <term><command>cmp</command></term>
|
---|
| 75 | <listitem>
|
---|
| 76 | <para>Compares two files and reports whether or in which bytes
|
---|
| 77 | they differ</para>
|
---|
| 78 | <indexterm zone="ch-system-diffutils cmp">
|
---|
| 79 | <primary sortas="b-cmp">cmp</primary>
|
---|
| 80 | </indexterm>
|
---|
| 81 | </listitem>
|
---|
| 82 | </varlistentry>
|
---|
| 83 |
|
---|
| 84 | <varlistentry id="diff">
|
---|
| 85 | <term><command>diff</command></term>
|
---|
| 86 | <listitem>
|
---|
| 87 | <para>Compares two files or directories and reports which lines in
|
---|
| 88 | the files differ</para>
|
---|
| 89 | <indexterm zone="ch-system-diffutils diff">
|
---|
| 90 | <primary sortas="b-diff">diff</primary>
|
---|
| 91 | </indexterm>
|
---|
| 92 | </listitem>
|
---|
| 93 | </varlistentry>
|
---|
| 94 |
|
---|
| 95 | <varlistentry id="diff3">
|
---|
| 96 | <term><command>diff3</command></term>
|
---|
| 97 | <listitem>
|
---|
| 98 | <para>Compares three files line by line</para>
|
---|
| 99 | <indexterm zone="ch-system-diffutils diff3">
|
---|
| 100 | <primary sortas="b-diff3">diff3</primary>
|
---|
| 101 | </indexterm>
|
---|
| 102 | </listitem>
|
---|
| 103 | </varlistentry>
|
---|
| 104 |
|
---|
| 105 | <varlistentry id="sdiff">
|
---|
| 106 | <term><command>sdiff</command></term>
|
---|
| 107 | <listitem>
|
---|
| 108 | <para>Merges two files and interactively outputs the results</para>
|
---|
| 109 | <indexterm zone="ch-system-diffutils sdiff">
|
---|
| 110 | <primary sortas="b-sdiff">sdiff</primary>
|
---|
| 111 | </indexterm>
|
---|
| 112 | </listitem>
|
---|
| 113 | </varlistentry>
|
---|
| 114 |
|
---|
| 115 | </variablelist>
|
---|
| 116 |
|
---|
| 117 | </sect2>
|
---|
| 118 |
|
---|
| 119 | </sect1>
|
---|