[02095ae] | 1 | <?xml version="1.0" encoding="ISO-8859-1"?> |
---|
[c439b8a] | 2 | <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" |
---|
| 3 | "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ |
---|
[02095ae] | 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 | |
---|
[12e6567] | 25 | &env-target; |
---|
| 26 | |
---|
[02095ae] | 27 | <sect2 role="installation"> |
---|
| 28 | <title>Installation of Diffutils</title> |
---|
| 29 | |
---|
[e84c831] | 30 | <para os="p1">This patch adds support for Internationalization:</para> |
---|
| 31 | |
---|
| 32 | <screen os="p2"><userinput>patch -Np1 -i ../&diffutils-i18n-patch;</userinput></screen> |
---|
| 33 | |
---|
[02095ae] | 34 | <para os="a">Prepare Diffutils for compilation:</para> |
---|
| 35 | |
---|
[cee2ca2] | 36 | <screen os="b"><userinput>./configure --build=${CLFS_HOST} --host=${CLFS_TARGET} \ |
---|
| 37 | --prefix=/usr</userinput></screen> |
---|
[02095ae] | 38 | |
---|
[93a6da3] | 39 | <para os="s1">Diffutils wants ed as the default editor, the following sed will allow us |
---|
| 40 | to use vim:</para> |
---|
| 41 | |
---|
| 42 | <screen os="s2"><userinput>sed -i 's@\(^#define DEFAULT_EDITOR_PROGRAM \).*@\1"vi"@' config.h</userinput></screen> |
---|
| 43 | |
---|
[7ec27e2] | 44 | <para os="s3">Diffutils man-pages want to be recreated, but it requires |
---|
| 45 | help2man. So we update the time on the files to prevent them from being |
---|
| 46 | recreated:</para> |
---|
| 47 | |
---|
| 48 | <screen os="s4"><userinput>touch man/*.1</userinput></screen> |
---|
| 49 | |
---|
| 50 | |
---|
[02095ae] | 51 | <para os="c">Compile the package:</para> |
---|
| 52 | |
---|
| 53 | <screen os="d"><userinput>make</userinput></screen> |
---|
| 54 | |
---|
| 55 | <para os="e">Install the package:</para> |
---|
| 56 | |
---|
[586feb7] | 57 | <screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen> |
---|
[02095ae] | 58 | |
---|
| 59 | </sect2> |
---|
| 60 | |
---|
| 61 | <sect2 id="contents-diffutils" role="content"> |
---|
| 62 | <title>Contents of Diffutils</title> |
---|
| 63 | |
---|
| 64 | <segmentedlist> |
---|
| 65 | <segtitle>Installed programs</segtitle> |
---|
| 66 | |
---|
| 67 | <seglistitem> |
---|
| 68 | <seg>cmp, diff, diff3, and sdiff</seg> |
---|
| 69 | </seglistitem> |
---|
| 70 | </segmentedlist> |
---|
| 71 | |
---|
| 72 | <variablelist> |
---|
| 73 | <bridgehead renderas="sect3">Short Descriptions</bridgehead> |
---|
| 74 | <?dbfo list-presentation="list"?> |
---|
| 75 | <?dbhtml list-presentation="table"?> |
---|
| 76 | |
---|
| 77 | <varlistentry id="cmp"> |
---|
| 78 | <term><command>cmp</command></term> |
---|
| 79 | <listitem> |
---|
| 80 | <para>Compares two files and reports whether or in which bytes |
---|
| 81 | they differ</para> |
---|
| 82 | <indexterm zone="ch-system-diffutils cmp"> |
---|
| 83 | <primary sortas="b-cmp">cmp</primary> |
---|
| 84 | </indexterm> |
---|
| 85 | </listitem> |
---|
| 86 | </varlistentry> |
---|
| 87 | |
---|
| 88 | <varlistentry id="diff"> |
---|
| 89 | <term><command>diff</command></term> |
---|
| 90 | <listitem> |
---|
| 91 | <para>Compares two files or directories and reports which lines in |
---|
| 92 | the files differ</para> |
---|
| 93 | <indexterm zone="ch-system-diffutils diff"> |
---|
| 94 | <primary sortas="b-diff">diff</primary> |
---|
| 95 | </indexterm> |
---|
| 96 | </listitem> |
---|
| 97 | </varlistentry> |
---|
| 98 | |
---|
| 99 | <varlistentry id="diff3"> |
---|
| 100 | <term><command>diff3</command></term> |
---|
| 101 | <listitem> |
---|
| 102 | <para>Compares three files line by line</para> |
---|
| 103 | <indexterm zone="ch-system-diffutils diff3"> |
---|
| 104 | <primary sortas="b-diff3">diff3</primary> |
---|
| 105 | </indexterm> |
---|
| 106 | </listitem> |
---|
| 107 | </varlistentry> |
---|
| 108 | |
---|
| 109 | <varlistentry id="sdiff"> |
---|
| 110 | <term><command>sdiff</command></term> |
---|
| 111 | <listitem> |
---|
| 112 | <para>Merges two files and interactively outputs the results</para> |
---|
| 113 | <indexterm zone="ch-system-diffutils sdiff"> |
---|
| 114 | <primary sortas="b-sdiff">sdiff</primary> |
---|
| 115 | </indexterm> |
---|
| 116 | </listitem> |
---|
| 117 | </varlistentry> |
---|
| 118 | |
---|
| 119 | </variablelist> |
---|
| 120 | |
---|
| 121 | </sect2> |
---|
| 122 | |
---|
| 123 | </sect1> |
---|