From d1b03c872e3dcc6867febf8b613a7a4142949a19 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Thu, 12 Mar 2009 21:01:24 +0000
Subject: Build mkswap for e2fsprogs' testsuite, and remove unnecessary
 BLKID_LIBS variable. Fixes #2361.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8835 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter05/util-linux-ng.xml | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

(limited to 'chapter05/util-linux-ng.xml')

diff --git a/chapter05/util-linux-ng.xml b/chapter05/util-linux-ng.xml
index 80eafac5c..67b0b9f42 100644
--- a/chapter05/util-linux-ng.xml
+++ b/chapter05/util-linux-ng.xml
@@ -50,24 +50,10 @@
     <para>Only a few of the utilities contained in this package need to be
     built:</para>
 
-<screen><userinput remap="make">make BLKID_LIBS="-lblkid -luuid" -C mount mount umount
+<screen><userinput remap="make">make -C disk-utils mkswap
+make -C mount mount umount
 make -C text-utils more</userinput></screen>
 
-    <variablelist>
-      <title>The meaning of the make parameter:</title>
-
-      <varlistentry>
-        <term><parameter>BLKID_LIBS="-lblkid -luuid"</parameter></term>
-        <listitem>
-          <para>When building only a subset of the package, the
-          <filename class="libraryfile">libuuid.a</filename> library is not
-          pulled into the build as it is supposed to. This command overrides
-          the default from the <filename>Makefile</filename>.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
     <!-- Not sure why this is in there. There is no test suite. Though
          running 'make check' may build these programs, there is no
          testing done.
@@ -81,7 +67,7 @@ make -C text-utils more</userinput></screen>
 
     <para>Copy these programs to the temporary tools directory:</para>
 
-<screen><userinput remap="install">cp -v mount/{,u}mount text-utils/more /tools/bin</userinput></screen>
+<screen><userinput remap="install">cp -v disk-utils/mkswap mount/{,u}mount text-utils/more /tools/bin</userinput></screen>
 
   </sect2>
 
-- 
cgit v1.2.3-54-g00ecf