From 123880fa3b906bacae2ebda392a0ed99eda4edc3 Mon Sep 17 00:00:00 2001
From: Thomas Balu Walter <tw@itreff.de>
Date: Fri, 30 Mar 2001 23:43:09 +0000
Subject: [PATCH] easier procps-installation

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@386 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml   |  4 ++++
 chapter06/procps-exp.xml  | 11 +++++------
 chapter06/procps-inst.xml |  5 ++---
 index.xml                 |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 39fc31101..dcdd91e84 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -108,6 +108,10 @@ the ldconfig and ldd programs anymore; Glibc-2.2.1 comes with good
 working versions.
 </para></listitem>
 
+<listitem><para>
+Chapter 6: Changed the procps installation from sed'ing to an easier way.
+</para></listitem>
+
 <listitem><para>
 Chapter 6: Added the creation of the lex symlink to the flex
 installation.
diff --git a/chapter06/procps-exp.xml b/chapter06/procps-exp.xml
index f08fe8383..0b5a00c2c 100644
--- a/chapter06/procps-exp.xml
+++ b/chapter06/procps-exp.xml
@@ -2,12 +2,11 @@
 <title>Command explanations</title>
 
 <para>
-<userinput>sed "s/XConsole/#XConsole/" Makefile | make -f -:</userinput> 
-This will comment out the XConsole variable in the Makefile and pipe the
-output of sed (the modified Makefile) directly to the make program. This
-is an alternate and more efficient way to direct the output to a file
-and tell make to use that alternate file. The XConsole build is disabled
-because it can't be build yet because we don't have X installed yet.
+<userinput>make XSCPT='' install:</userinput> 
+This will set the Makefile variable XSCPT to an empty value so that
+the XConsole installation is disabled. Otherwise "Make install" tries to
+copy the file XConsole to /usr/X11R6/bin.
+And that directory does not exist, because X is not installed yet.
 </para>
 
 </sect2>
diff --git a/chapter06/procps-inst.xml b/chapter06/procps-inst.xml
index 917def8c5..f89712ad0 100644
--- a/chapter06/procps-inst.xml
+++ b/chapter06/procps-inst.xml
@@ -7,9 +7,8 @@ Install Procps by running the following commands:
 
 <blockquote><literallayout>
 
-	<userinput>sed "s/XConsole/#XConsole/" Makefile | make -f -
-		&amp;&amp;</userinput>
-	<userinput>sed "s/XConsole/#XConsole/" Makefile | make -f - install
+	<userinput>make &amp;&amp;</userinput>
+	<userinput>make XSCPT='' install
 		&amp;&amp;</userinput>	
 	<userinput>mv /usr/bin/kill /bin</userinput>
 
diff --git a/index.xml b/index.xml
index 066bc338e..32d807058 100644
--- a/index.xml
+++ b/index.xml
@@ -4,7 +4,7 @@
 
 <!ENTITY book SYSTEM "intel/book/book.xml">
 
-<!ENTITY version "3.0-CVS-2001-03-29">
+<!ENTITY version "3.0-CVS-2001-03-31">
 <!ENTITY releasedate "March 28th, 2001">
 <!ENTITY type "INTEL">