From c711a6187d566eaa4c7adca63293a1c595c790f4 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sat, 1 Aug 2009 04:31:13 +0000
Subject: [PATCH] Added switch to install udev documentation in the proper
 versioned directory.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9035 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 13 ++++++++++++-
 chapter06/udev.xml      | 10 ++++++++++
 chapter07/symlinks.xml  |  3 ++-
 chapter07/udev.xml      |  3 ++-
 general.ent             |  4 ++--
 5 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 7be0095c7..1b993276d 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,18 @@
     </listitem>
 
 -->
+    <listitem>
+      <para>2009-07-29</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Added switch to install udev documentation in the 
+          proper versioned directory.
+          Fixes
+          <ulink url="&lfs-ticket-root;2459">#2459</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2009-07-29</para>
       <itemizedlist>
@@ -57,7 +69,6 @@
       </itemizedlist>
     </listitem>
 
-
     <listitem>
       <para>2009-07-28</para>
       <itemizedlist>
diff --git a/chapter06/udev.xml b/chapter06/udev.xml
index 06999f333..366819dc7 100644
--- a/chapter06/udev.xml
+++ b/chapter06/udev.xml
@@ -64,6 +64,7 @@ ln -sv /proc/kcore /lib/udev/devices/core</userinput></screen>
 <screen><userinput remap="configure">./configure --prefix=/usr \
     --sysconfdir=/etc --sbindir=/sbin \
     --with-rootlibdir=/lib --libexecdir=/lib/udev \
+    --docdir=/usr/share/doc/udev-&udev-version; \
     --disable-extras</userinput></screen>
 
     <variablelist>
@@ -93,6 +94,15 @@ ln -sv /proc/kcore /lib/udev/devices/core</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><parameter>--docdir=/usr/share/doc/udev-&udev-version;</parameter></term>
+        <listitem>
+          <para>This option installs the Udev documentation in the
+          proper location with the naming convention consistent with 
+          other packages.</para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><parameter>--disable-extras</parameter></term>
         <listitem>
diff --git a/chapter07/symlinks.xml b/chapter07/symlinks.xml
index 065a62f5b..3242f1795 100644
--- a/chapter07/symlinks.xml
+++ b/chapter07/symlinks.xml
@@ -146,7 +146,8 @@ EOF</userinput></screen>
     device.</para>
 
     <para>More information on writing Udev rules can be found in
-    <filename>/usr/share/doc/udev-&udev-version;/index.html</filename>.</para>
+    <filename>/usr/share/doc/udev-&udev-version;/writing_udev_rules/index.html</filename>.
+    </para>
 
  </sect2>
 
diff --git a/chapter07/udev.xml b/chapter07/udev.xml
index b4f623ce5..468a5035f 100644
--- a/chapter07/udev.xml
+++ b/chapter07/udev.xml
@@ -136,7 +136,8 @@
       it will default permissions to <emphasis>660</emphasis> and ownership to
       <emphasis>root:root</emphasis>. Documentation on the syntax of the Udev
       rules configuration files are available in
-      <filename>/usr/share/doc/udev-&udev-version;/index.html</filename></para>
+      <filename>/usr/share/doc/udev-&udev-version;/writing_udev_rules/index.html</filename>
+      </para>
 
     </sect3>
 
diff --git a/general.ent b/general.ent
index bf1ce38db..c1548eea6 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20090729">
-<!ENTITY releasedate "July 29, 2009">
+<!ENTITY version "SVN-20090801">
+<!ENTITY releasedate "August 1, 2009">
 <!ENTITY copyrightdate "1999-2009"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "6.5">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->