diff options
| author | David Zeuthen <davidz@redhat.com> | 2007-03-04 21:24:33 -0500 |
|---|---|---|
| committer | David Zeuthen <davidz@redhat.com> | 2007-03-04 21:24:33 -0500 |
| commit | 7db7f143228a78a0f8f6e955a934f705969e0e3f (patch) | |
| tree | 5424490c0eb7982765456707906c96e4728f8a63 | |
| parent | 0c16761e61064979daa7b39ce0083f064676e578 (diff) | |
some fixes to make distcheck work again
| -rw-r--r-- | hald/create_cache.c | 2 | ||||
| -rwxr-xr-x | hald/hald-cache-test.sh | 16 | ||||
| -rw-r--r-- | tools/device-manager/Makefile.am | 2 |
3 files changed, 12 insertions, 8 deletions
diff --git a/hald/create_cache.c b/hald/create_cache.c index 0dae85d9..48cd7a62 100644 --- a/hald/create_cache.c +++ b/hald/create_cache.c @@ -516,7 +516,7 @@ rules_search_and_add_fdi_files (const char *dir, int fd) 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 d026a988..1f3fb902 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 5506b714..69dcc144 100644 --- a/tools/device-manager/Makefile.am +++ b/tools/device-manager/Makefile.am @@ -40,6 +40,8 @@ hal-device-manager: hal-device-manager.in Makefile 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) |