| [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 |  | 
|---|
| [2da3f67c] | 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 |  | 
|---|
| [0deb83a] | 32 | <para os="s3">Adjust the source to build with the included GNULIB code:"</para> | 
|---|
|  | 33 | <screen os="s4"><userinput>sed -i '233,237 s/max)/max) \\/' lib/intprops.h</userinput></screen> | 
|---|
|  | 34 |  | 
|---|
| [e0e40d3] | 35 | <para os="a">Prepare Diffutils for compilation:</para> | 
|---|
| [3f8be484] | 36 |  | 
|---|
| [b27081c4] | 37 | <screen os="b"><userinput>./configure \ | 
|---|
|  | 38 | --prefix=/usr</userinput></screen> | 
|---|
| [3f8be484] | 39 |  | 
|---|
| [2487c4c] | 40 | <para os="s3">Diffutils wants <command>ed</command> as the default editor | 
|---|
|  | 41 | for <command>sdiff</command>. The following <command>sed</command> will | 
|---|
|  | 42 | change the default to <command>vi</command>:</para> | 
|---|
| [6a5fd75] | 43 |  | 
|---|
| [1bcea75] | 44 | <screen os="s4"><userinput>sed -i 's@\(^#define DEFAULT_EDITOR_PROGRAM \).*@\1"vi"@' lib/config.h</userinput></screen> | 
|---|
| [bf252b7] | 45 |  | 
|---|
| [e0e40d3] | 46 | <para os="c">Compile the package:</para> | 
|---|
| [3f8be484] | 47 |  | 
|---|
| [e0e40d3] | 48 | <screen os="d"><userinput>make</userinput></screen> | 
|---|
| [3f8be484] | 49 |  | 
|---|
| [686839b] | 50 | <para os="e">To test the results, issue:</para> | 
|---|
|  | 51 |  | 
|---|
|  | 52 | <screen os="e2"><userinput remap="test">make check</userinput></screen> | 
|---|
| [3f8be484] | 53 |  | 
|---|
| [e0e40d3] | 54 | <para os="f">Install the package:</para> | 
|---|
| [3f8be484] | 55 |  | 
|---|
| [e0e40d3] | 56 | <screen os="g"><userinput>make install</userinput></screen> | 
|---|
| [3f8be484] | 57 |  | 
|---|
|  | 58 | </sect2> | 
|---|
|  | 59 |  | 
|---|
|  | 60 | <sect2 id="contents-diffutils" role="content"> | 
|---|
|  | 61 | <title>Contents of Diffutils</title> | 
|---|
|  | 62 |  | 
|---|
|  | 63 | <segmentedlist> | 
|---|
|  | 64 | <segtitle>Installed programs</segtitle> | 
|---|
|  | 65 |  | 
|---|
|  | 66 | <seglistitem> | 
|---|
| [c2102b28] | 67 | <seg>cmp, diff, diff3, sdiff</seg> | 
|---|
| [3f8be484] | 68 | </seglistitem> | 
|---|
|  | 69 | </segmentedlist> | 
|---|
|  | 70 |  | 
|---|
|  | 71 | <variablelist> | 
|---|
|  | 72 | <bridgehead renderas="sect3">Short Descriptions</bridgehead> | 
|---|
|  | 73 | <?dbfo list-presentation="list"?> | 
|---|
|  | 74 | <?dbhtml list-presentation="table"?> | 
|---|
|  | 75 |  | 
|---|
|  | 76 | <varlistentry id="cmp"> | 
|---|
|  | 77 | <term><command>cmp</command></term> | 
|---|
|  | 78 | <listitem> | 
|---|
|  | 79 | <para>Compares two files and reports whether or in which bytes | 
|---|
|  | 80 | they differ</para> | 
|---|
|  | 81 | <indexterm zone="ch-system-diffutils cmp"> | 
|---|
|  | 82 | <primary sortas="b-cmp">cmp</primary> | 
|---|
|  | 83 | </indexterm> | 
|---|
|  | 84 | </listitem> | 
|---|
|  | 85 | </varlistentry> | 
|---|
|  | 86 |  | 
|---|
|  | 87 | <varlistentry id="diff"> | 
|---|
|  | 88 | <term><command>diff</command></term> | 
|---|
|  | 89 | <listitem> | 
|---|
|  | 90 | <para>Compares two files or directories and reports which lines in | 
|---|
|  | 91 | the files differ</para> | 
|---|
|  | 92 | <indexterm zone="ch-system-diffutils diff"> | 
|---|
|  | 93 | <primary sortas="b-diff">diff</primary> | 
|---|
|  | 94 | </indexterm> | 
|---|
|  | 95 | </listitem> | 
|---|
|  | 96 | </varlistentry> | 
|---|
|  | 97 |  | 
|---|
|  | 98 | <varlistentry id="diff3"> | 
|---|
|  | 99 | <term><command>diff3</command></term> | 
|---|
|  | 100 | <listitem> | 
|---|
|  | 101 | <para>Compares three files line by line</para> | 
|---|
|  | 102 | <indexterm zone="ch-system-diffutils diff3"> | 
|---|
|  | 103 | <primary sortas="b-diff3">diff3</primary> | 
|---|
|  | 104 | </indexterm> | 
|---|
|  | 105 | </listitem> | 
|---|
|  | 106 | </varlistentry> | 
|---|
|  | 107 |  | 
|---|
|  | 108 | <varlistentry id="sdiff"> | 
|---|
|  | 109 | <term><command>sdiff</command></term> | 
|---|
|  | 110 | <listitem> | 
|---|
|  | 111 | <para>Merges two files and interactively outputs the results</para> | 
|---|
|  | 112 | <indexterm zone="ch-system-diffutils sdiff"> | 
|---|
|  | 113 | <primary sortas="b-sdiff">sdiff</primary> | 
|---|
|  | 114 | </indexterm> | 
|---|
|  | 115 | </listitem> | 
|---|
|  | 116 | </varlistentry> | 
|---|
|  | 117 |  | 
|---|
|  | 118 | </variablelist> | 
|---|
|  | 119 |  | 
|---|
|  | 120 | </sect2> | 
|---|
|  | 121 |  | 
|---|
|  | 122 | </sect1> | 
|---|