1 | <?xml version="1.0" encoding="ISO-8859-1"?>
|
---|
2 | <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
|
---|
3 | "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
|
---|
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 |
|
---|
28 | <para os="s1">Fix a bug that prevents locale files from being installed:</para>
|
---|
29 |
|
---|
30 | <screen os="s2"><userinput>sed -i 's:= @mkdir_p@:= /bin/mkdir -p:' po/Makefile.in.in</userinput></screen>
|
---|
31 |
|
---|
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 |
|
---|
35 | <para os="a">Prepare Diffutils for compilation:</para>
|
---|
36 |
|
---|
37 | <screen os="b"><userinput>./configure \
|
---|
38 | --prefix=/usr</userinput></screen>
|
---|
39 |
|
---|
40 | <para os="s5">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>
|
---|
43 |
|
---|
44 | <screen os="s6"><userinput>sed -i 's@\(^#define DEFAULT_EDITOR_PROGRAM \).*@\1"vi"@' lib/config.h</userinput></screen>
|
---|
45 | <para os="c">Compile the package:</para>
|
---|
46 |
|
---|
47 | <screen os="d"><userinput>make</userinput></screen>
|
---|
48 |
|
---|
49 | <para os="e">To test the results, issue:</para>
|
---|
50 |
|
---|
51 | <screen os="e2"><userinput remap="test">make check</userinput></screen>
|
---|
52 |
|
---|
53 | <para os="f">Install the package:</para>
|
---|
54 |
|
---|
55 | <screen os="g"><userinput>make install</userinput></screen>
|
---|
56 |
|
---|
57 | </sect2>
|
---|
58 |
|
---|
59 | <sect2 id="contents-diffutils" role="content">
|
---|
60 | <title>Contents of Diffutils</title>
|
---|
61 |
|
---|
62 | <segmentedlist>
|
---|
63 | <segtitle>Installed programs</segtitle>
|
---|
64 |
|
---|
65 | <seglistitem>
|
---|
66 | <seg>cmp, diff, diff3, sdiff</seg>
|
---|
67 | </seglistitem>
|
---|
68 | </segmentedlist>
|
---|
69 |
|
---|
70 | <variablelist>
|
---|
71 | <bridgehead renderas="sect3">Short Descriptions</bridgehead>
|
---|
72 | <?dbfo list-presentation="list"?>
|
---|
73 | <?dbhtml list-presentation="table"?>
|
---|
74 |
|
---|
75 | <varlistentry id="cmp">
|
---|
76 | <term><command>cmp</command></term>
|
---|
77 | <listitem>
|
---|
78 | <para>Compares two files and reports whether or in which bytes
|
---|
79 | they differ</para>
|
---|
80 | <indexterm zone="ch-system-diffutils cmp">
|
---|
81 | <primary sortas="b-cmp">cmp</primary>
|
---|
82 | </indexterm>
|
---|
83 | </listitem>
|
---|
84 | </varlistentry>
|
---|
85 |
|
---|
86 | <varlistentry id="diff">
|
---|
87 | <term><command>diff</command></term>
|
---|
88 | <listitem>
|
---|
89 | <para>Compares two files or directories and reports which lines in
|
---|
90 | the files differ</para>
|
---|
91 | <indexterm zone="ch-system-diffutils diff">
|
---|
92 | <primary sortas="b-diff">diff</primary>
|
---|
93 | </indexterm>
|
---|
94 | </listitem>
|
---|
95 | </varlistentry>
|
---|
96 |
|
---|
97 | <varlistentry id="diff3">
|
---|
98 | <term><command>diff3</command></term>
|
---|
99 | <listitem>
|
---|
100 | <para>Compares three files line by line</para>
|
---|
101 | <indexterm zone="ch-system-diffutils diff3">
|
---|
102 | <primary sortas="b-diff3">diff3</primary>
|
---|
103 | </indexterm>
|
---|
104 | </listitem>
|
---|
105 | </varlistentry>
|
---|
106 |
|
---|
107 | <varlistentry id="sdiff">
|
---|
108 | <term><command>sdiff</command></term>
|
---|
109 | <listitem>
|
---|
110 | <para>Merges two files and interactively outputs the results</para>
|
---|
111 | <indexterm zone="ch-system-diffutils sdiff">
|
---|
112 | <primary sortas="b-sdiff">sdiff</primary>
|
---|
113 | </indexterm>
|
---|
114 | </listitem>
|
---|
115 | </varlistentry>
|
---|
116 |
|
---|
117 | </variablelist>
|
---|
118 |
|
---|
119 | </sect2>
|
---|
120 |
|
---|
121 | </sect1>
|
---|