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