source: BOOK/final-system/common/diffutils.xml@ e2bd716

systemd
Last change on this file since e2bd716 was bde571b, checked in by Chris Staub <chris@…>, 10 years ago

Wording improvement

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