[PATCH] respect prefix= setting when building udev.conf

[PATCH] respect prefix= setting when building udev.conf

[Kevin P. Fleming]

[-- Attachment #1: Type: text/plain, Size: 204 bytes --]

The lines in the default udev.conf that point to /etc/udev/rules.d and 
/etc/udev/permissions.d don't respect the prefix= setting the user 
supplies when building udev.

The attached patch corrects this.

[-- Attachment #2: udev-etc-dir.patch --]
[-- Type: text/plain, Size: 1414 bytes --]

Submitted By: Kevin P. Fleming <kpfleming@linuxfromscratch.org>
Date: 2004-09-16
Initial Package Version: 032
Origin: David Jensen (modified by KPF)
Description: correct udev's Makefile and template config file
to respect the "prefix=" setting supplied when it is built

diff -ur udev-orig/Makefile udev-032/Makefile
--- udev-orig/Makefile	Mon Sep 13 22:55:34 2004
+++ udev-032/Makefile	Thu Sep 16 10:57:11 2004
@@ -244,7 +244,7 @@
 
 # Rules on how to create the generated config files
 $(LOCAL_CFG_DIR)/udev.conf:
-	sed -e "s:@udevdir@:$(udevdir):" < $(LOCAL_CFG_DIR)/udev.conf.in > $@
+	sed -e "s:@udevdir@:$(udevdir):" -e "s:@configdir@:$(configdir):" < $(LOCAL_CFG_DIR)/udev.conf.in > $@
 
 GEN_MANPAGES   = udev.8
 GEN_MANPAGESIN = udev.8.in
diff -ur udev-orig/etc/udev/udev.conf.in udev-032/etc/udev/udev.conf.in
--- udev-orig/etc/udev/udev.conf.in	Mon Sep 13 22:55:36 2004
+++ udev-032/etc/udev/udev.conf.in	Thu Sep 16 10:57:26 2004
@@ -12,10 +12,10 @@
 udev_db="@udevdir@/.udev.tdb"
 
 # udev_rules - The name and location of the udev rules file
-udev_rules="/etc/udev/rules.d/"
+udev_rules="@configdir@/rules.d/"
 
 # udev_permissions - The name and location of the udev permission file
-udev_permissions="/etc/udev/permissions.d/"
+udev_permissions="@configdir@/permissions.d/"
 
 # default_mode - set the default mode for all nodes that have no
 #                explicit match in the permissions file