hal: Branch 'master'

[Richard Hughes]

 configure.in     |    4 ----
 fdi/Makefile.am  |    2 +-
 hald/run-hald.sh |   10 +++++++++-
 3 files changed, 10 insertions(+), 6 deletions(-)

New commits:
diff-tree 87c1c4b9b078b007836c658f251e9ce6ce2891bf (from 49abf2145106009fe92a4efd82ff510a5c945d45)
Author: Richard Hughes <hughsie at hughsie-laptop.(none)>
Date:   Mon Nov 6 23:53:22 2006 +0000

    move the information scripts to hal-info
    
    Move the information fdi files to hal-info.
    YOU NOW NEED TO PACKAGE AND INSTALL HAL-INFO AS WELL AS HAL.

diff --git a/configure.in b/configure.in
index f4eb57b..bb41521 100644
--- a/configure.in
+++ b/configure.in
@@ -576,10 +576,6 @@ fdi/preprobe/Makefile
 fdi/preprobe/10osvendor/Makefile
 fdi/preprobe/20thirdparty/Makefile
 fdi/preprobe/30user/Makefile
-fdi/information/Makefile
-fdi/information/10freedesktop/Makefile
-fdi/information/20thirdparty/Makefile
-fdi/information/30user/Makefile
 fdi/policy/Makefile
 fdi/policy/10osvendor/Makefile
 fdi/policy/20thirdparty/Makefile
diff --git a/fdi/Makefile.am b/fdi/Makefile.am
index a8115b9..ccc8b16 100644
--- a/fdi/Makefile.am
+++ b/fdi/Makefile.am
@@ -1,5 +1,5 @@
 
-SUBDIRS = information policy preprobe
+SUBDIRS = policy preprobe
 
 EXTRA_DIST = fdi.dtd fdi.rng
 
diff --git a/hald/run-hald.sh b/hald/run-hald.sh
index 0ae1f6b..7ffd4c9 100755
--- a/hald/run-hald.sh
+++ b/hald/run-hald.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+information_fdidir="../../hal-info/fdi"
+
 export HALD_RUNNER_PATH=`pwd`/linux:`pwd`/linux/probing:`pwd`/linux/addons:`pwd`/.:`pwd`/../tools:`pwd`/../tools/linux
 export PATH=`pwd`/../hald-runner:$PATH
 
@@ -7,7 +9,13 @@ if [ "$1" = "--skip-fdi-install" ] ; the
     shift
 else
     rm -rf .local-fdi
-    make -C ../fdi install DESTDIR=`pwd`/.local-fdi prefix=/
+    make -C ../fdi install DESTDIR=`pwd`/.local-fdi prefix=/ && \
+    if [ ! -d $information_fdidir ] ; then
+    	echo "ERROR: You need to checkout hal-info in the same level"
+    	echo "directory as hal to get the information fdi files."
+    	exit
+    fi
+    make -C $information_fdidir install DESTDIR=`pwd`/.local-fdi prefix=/
 fi
 export HAL_FDI_SOURCE_PREPROBE=.local-fdi/share/hal/fdi/preprobe
 export HAL_FDI_SOURCE_INFORMATION=.local-fdi/share/hal/fdi/information