From 4b31e82b2853d5e3889c02591839c40e577da5a2 Mon Sep 17 00:00:00 2001
From: Jeremy Utley <jeremy@linuxfromscratch.org>
Date: Wed, 13 Oct 2004 03:15:56 +0000
Subject: [PATCH] Added the udev DESTDIR patch

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@4276 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 4 ++++
 chapter03/patches.xml   | 6 ++++++
 chapter05/udev.xml      | 8 ++++++--
 chapter06/udev.xml      | 2 +-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index d1dcb79ea..86ffec8f0 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -66,6 +66,7 @@ first a summary, then a detailed log.</para>
 <listitem><para>syslog-ng-1.6.5</para></listitem>
 <listitem><para>sysvinit-2.85-proclen-1.patch</para></listitem>
 <listitem><para>udev-035</para></listitem>
+<listitem><para>udev-035-DESTDIR-1.patch</para></listitem>
 <listitem><para>udev-config-1.permissions</para></listitem>
 <listitem><para>udev-config-1.rules</para></listitem>
 <listitem><para>util-linux-2.12a-kernel_headers-1.patch</para></listitem>
@@ -91,6 +92,9 @@ first a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>October 12th, 2004 [jeremy]: Added the new DESTDIR patch
+developed by David Jensen to the udev instructions</para></listitem>
+
 <listitem><para>October 12th, 2004 [jeremy]: Upgraded to man-pages-1.69 and
 udev-035, which eliminates the need for the etcdir patch present for 032.</para></listitem>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 669bb004c..945c35c02 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -132,6 +132,12 @@ following:</para>
 </listitem>
 </varlistentry>
 
+<varlistentry>
+<term>Udev Destdir Patch - 1 KB:</term> <listitem>
+<para><ulink url="&patches-root;udev-&udev-version;-DESTDIR-1.patch"/></para>
+</listitem>
+</varlistentry>
+
 <varlistentry>
 <term>Util-Linux Sfdisk Patch - 1 KB:</term> <listitem>
 <para><ulink url="&patches-root;util-linux-&util-linux-version;-sfdisk-2.patch"/></para>
diff --git a/chapter05/udev.xml b/chapter05/udev.xml
index e4100630a..b13120178 100644
--- a/chapter05/udev.xml
+++ b/chapter05/udev.xml
@@ -29,13 +29,17 @@
 <sect2 role="installation">
 <title>Installation of Udev</title>
 
-<para>Compile Udev:</para>
+<para>The following patch makes Udev respect the DESTDIR variable:</para>
+
+<screen><userinput>patch -Np1 -i ../udev-&udev-version;-DESTDIR-1.patch</userinput></screen>
+
+<para>Now compile Udev:</para>
 
 <screen><userinput>make prefix=/tools udevdir=/dev</userinput></screen>
 
 <para>Install it:</para>
 
-<screen><userinput>make prefix=/tools install</userinput></screen>
+<screen><userinput>make DESTDIR=/tools udevdir=/dev install</userinput></screen>
 
 <para>Udev's configuration is far from ideal by default, so we install our own
 configuration files here:</para>
diff --git a/chapter06/udev.xml b/chapter06/udev.xml
index 1c0bf18bf..a436d35b4 100644
--- a/chapter06/udev.xml
+++ b/chapter06/udev.xml
@@ -37,7 +37,7 @@ create device nodes in.</para></listitem>
 
 <para>Install it:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen><userinput>make udevdir=/dev install</userinput></screen>
 
 <para>Udev's configuration is far from ideal by default, so we install our own
 configuration files here:</para>