hal/fdi README,1.1,1.2

[David Zeuthen]

Update of /cvs/hal/hal/fdi
In directory gabe:/tmp/cvs-serv19937/fdi

Modified Files:
	README 
Log Message:
2005-02-24  David Zeuthen  <davidz at redhat.com>

	* fdi/README: Change so this fits better with current packaging
	policies; see this message and thread at
	http://lists.freedesktop.org/archives/hal/2005-February/002217.html

	* fdi/preprobe/*/Makefile.am, fdi/information/*/Makefile.am,
 	fdi/policy/*/Makefile.am: Fix up Makefile.am to install to the
	correct location. Also add 10-ide-drives.fdi to

	* fdi/preprobe/10osvendor/Makefile.am (dist_fdi_DATA): Add 
	10-ide-drives.fdi

	* hald/device_info.c (di_search_and_merge): Use new search
	logic as outlined in fdi/README



Index: README
===================================================================
RCS file: /cvs/hal/hal/fdi/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- README	23 Feb 2005 04:20:47 -0000	1.1
+++ README	24 Feb 2005 19:51:04 -0000	1.2
@@ -29,8 +29,11 @@
 
   preprobe
   |-- 10osvendor    # From the hal tarball and/or supplied by the os vendor
+  |                 # -> installs into /usr/share/hal/fdi/preprobe/10osvendor
   |-- 20thirdparty  # 3rd party projects and IHV's install here
-  `-- 30user        # Installed by the user
+  |                 # -> installs into /usr/share/hal/fdi/preprobe/20thirdparty
+  `-- 30user        # Installed by the user/admin
+                    # -> installs into /etc/hal/fdi/preprobe/
 
 [1] : http://lists.freedesktop.org/archives/hal/2004-August/000858.html
 
@@ -49,8 +52,11 @@
 
   information
   |-- 10freedesktop # From the hal tarball
+  |                 # -> installs into /usr/share/hal/fdi/information/10freedesktop
   |-- 20thirdparty  # 3rd party projects and IHV's install here
-  `-- 30user        # Installed by the user
+  |                 # -> installs into /usr/share/hal/fdi/information/20thirdparty
+  `-- 30user        # Installed by the user/admin
+                    # -> installs into /etc/hal/fdi/information
 
 
 3. Policy
@@ -66,6 +72,9 @@
 
   policy
   |-- 10osvendor    # From the hal tarball and/or supplied by the os vendor
+  |                 # -> installs into /usr/share/hal/fdi/policy/10freedesktop
   |-- 20thirdparty  # 3rd party projects and IHV's install here
-  `-- 30user        # Installed by the user
+  |                 # -> installs into /usr/share/hal/fdi/policy/20thirdparty
+  `-- 30user        # Installed by the user/admin
+                    # -> installs into /etc/hal/fdi/policy