aboutsummaryrefslogtreecommitdiffstats
path: root/chapter05/util-linux.xml
diff options
context:
space:
mode:
Diffstat (limited to 'chapter05/util-linux.xml')
-rw-r--r--chapter05/util-linux.xml40
1 files changed, 17 insertions, 23 deletions
diff --git a/chapter05/util-linux.xml b/chapter05/util-linux.xml
index d3708733f..073d2a1c6 100644
--- a/chapter05/util-linux.xml
+++ b/chapter05/util-linux.xml
@@ -5,19 +5,19 @@
%general-entities;
]>
-<sect1 id="ch-tools-util-linux" role="wrap">
- <?dbhtml filename="util-linux.html"?>
+<sect1 id="ch-tools-util-linux-ng" role="wrap">
+ <?dbhtml filename="util-linux-ng.html"?>
<sect1info condition="script">
- <productname>util-linux</productname>
- <productnumber>&util-linux-version;</productnumber>
- <address>&util-linux-url;</address>
+ <productname>util-linux-ng</productname>
+ <productnumber>&util-linux-ng-version;</productnumber>
+ <address>&util-linux-ng-url;</address>
</sect1info>
- <title>Util-linux-&util-linux-version;</title>
+ <title>Util-linux-ng-&util-linux-ng-version;</title>
- <indexterm zone="ch-tools-util-linux">
- <primary sortas="a-Util-linux">Util-linux</primary>
+ <indexterm zone="ch-tools-util-linux-ng">
+ <primary sortas="a-Util-linux-ng">Util-linux-ng</primary>
<secondary>tools</secondary>
</indexterm>
@@ -33,29 +33,19 @@
<segtitle>&diskspace;</segtitle>
<seglistitem>
- <seg>&util-linux-ch5-sbu;</seg>
- <seg>&util-linux-ch5-du;</seg>
+ <seg>&util-linux-ng-ch5-sbu;</seg>
+ <seg>&util-linux-ng-ch5-du;</seg>
</seglistitem>
</segmentedlist>
</sect2>
<sect2 role="installation">
- <title>Installation of Util-linux</title>
-
- <para>Util-linux does not use the freshly installed headers and libraries
- from the <filename class="directory">/tools</filename> directory by default.
- This is fixed by altering the configure script:</para>
-
-<screen><userinput remap="pre">sed -i 's@/usr/include@/tools/include@g' configure</userinput></screen>
+ <title>Installation of Util-linux-ng</title>
<para>Prepare Util-linux for compilation:</para>
-<screen><userinput remap="configure">./configure</userinput></screen>
-
- <para>Compile some support routines:</para>
-
-<screen><userinput remap="make">make -C lib</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen>
<para>Only a few of the utilities contained in this package need to be
built:</para>
@@ -63,7 +53,11 @@
<screen><userinput remap="make">make -C mount mount umount
make -C text-utils more</userinput></screen>
- <para>This package does not come with a test suite.</para>
+ <para>This package comes with a test suite, but running it will cause all of
+ the binaries to be built and tested. If you still wish to run the tests,
+ issue:</para>
+
+<screen><userinput remap="test">make check</userinput></screen>
<para>Copy these programs to the temporary tools directory:</para>