From 3383a53e90674b72f4202a647cae5aac0b32f741 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sun, 14 Oct 2012 05:48:05 +0000
Subject: Change procps to not install the kill program that is now installed
 by util-linux.

Update to util-linux-2.22.1.


git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10019 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/procps.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'chapter06')

diff --git a/chapter06/procps.xml b/chapter06/procps.xml
index 6fe443fd4..ea26619d1 100644
--- a/chapter06/procps.xml
+++ b/chapter06/procps.xml
@@ -50,10 +50,12 @@
 
 <screen><userinput remap="pre">patch -Np1 -i ../&procps-watch-patch;</userinput></screen>
 
-    <para>Fix a bug in the Makefile, which prevents procps from building with
+    <para>Do not install the kill program because it was installed by util-linux.
+    Also fix a bug in the Makefile, which prevents procps from building with
     make-&make-version;:</para>
 
-<screen><userinput remap="pre">sed -i -e 's@\*/module.mk@proc/module.mk ps/module.mk@' Makefile</userinput></screen>
+<screen><userinput remap="pre">sed -i -e 's@\*/module.mk@proc/module.mk ps/module.mk@' \
+       -e 's@^#SKIP/SKIP/' Makefile</userinput></screen>
 
     <para>Compile the package:</para>
 
-- 
cgit v1.2.3-54-g00ecf