hal: Branch 'master' - 2 commits

[David Zeuthen]

 hald/create_cache.c              |    2 +-
 hald/hald-cache-test.sh          |   16 +++++++++-------
 tools/device-manager/Makefile.am |    2 ++
 3 files changed, 12 insertions(+), 8 deletions(-)

New commits:
diff-tree abae38633af21ef4a2f784f9cd6de3c9247c3e1c (from parents)
Merge: 7db7f143228a78a0f8f6e955a934f705969e0e3f 6a82c2e0e1d1cf52fd812a26ceafc571c38aa4e0
Author: David Zeuthen <davidz at redhat.com>
Date:   Mon Mar 5 11:07:24 2007 -0500

    Merge branch 'master' of ssh://david@git.freedesktop.org/git/hal

diff-tree 7db7f143228a78a0f8f6e955a934f705969e0e3f (from 0c16761e61064979daa7b39ce0083f064676e578)
Author: David Zeuthen <davidz at redhat.com>
Date:   Sun Mar 4 21:24:33 2007 -0500

    some fixes to make distcheck work again

diff --git a/hald/create_cache.c b/hald/create_cache.c
index 0dae85d..48cd7a6 100644
--- a/hald/create_cache.c
+++ b/hald/create_cache.c
@@ -516,7 +516,7 @@ rules_search_and_add_fdi_files (const ch
 	
 	num_entries = scandir (dir, &name_list, 0, _alphasort);
 	if (num_entries == -1) {
-		HAL_ERROR (("Cannot scan '%s': %s", strerror (errno)));
+		HAL_ERROR (("Cannot scan '%s': %s", dir, strerror (errno)));
 		goto out;
 	}
 
diff --git a/hald/hald-cache-test.sh b/hald/hald-cache-test.sh
index d026a98..1f3fb90 100755
--- a/hald/hald-cache-test.sh
+++ b/hald/hald-cache-test.sh
@@ -1,16 +1,18 @@
 #!/bin/sh
-rm -rf .local-fdi
-make -C ../fdi install DESTDIR=`pwd`/.local-fdi prefix=/
+rm -rf .local-fdi-test
+mkdir .local-fdi-test
+make -C ../fdi install DESTDIR=`pwd`/.local-fdi-test prefix=/
 
-HAL_FDI_SOURCE_PREPROBE=.local-fdi/share/hal/fdi/preprobe
-HAL_FDI_SOURCE_INFORMATION=.local-fdi/share/hal/fdi/information
-HAL_FDI_SOURCE_POLICY=.local-fdi/share/hal/fdi/policy
-HAL_FDI_CACHE_NAME=.local-fdi/hald-local-fdi-cache
+HAL_FDI_SOURCE_PREPROBE=.local-fdi-test/share/hal/fdi/preprobe
+HAL_FDI_SOURCE_INFORMATION=.local-fdi-test/share/hal/fdi/preprobe
+HAL_FDI_SOURCE_POLICY=.local-fdi-test/share/hal/fdi/policy
+HAL_FDI_CACHE_NAME=.local-fdi-test/hald-local-fdi-cache
 export HAL_FDI_SOURCE_PREPROBE HAL_FDI_SOURCE_INFORMATION \
        HAL_FDI_SOURCE_POLICY HAL_FDI_CACHE_NAME
 
+#gdb run --args ./hald-generate-fdi-cache
 ./hald-generate-fdi-cache || exit 2
 ./hald-cache-test || exit 2
 
 #required by distcheck
-rm -Rf .local-fdi
+rm -Rf .local-fdi-test
diff --git a/tools/device-manager/Makefile.am b/tools/device-manager/Makefile.am
index 5506b71..69dcc14 100644
--- a/tools/device-manager/Makefile.am
+++ b/tools/device-manager/Makefile.am
@@ -40,6 +40,8 @@ hal-device-manager: hal-device-manager.i
 
 CLEANFILES = Const.py hal-device-manager
 
+EXTRA_DIST = Const.py.in hal-device-manager.in
+
 # symlink into $(bindir) for convenience
 #install-data-local :
 #	$(mkinstalldirs) $(DESTDIR)$(bindir)