hal: Branch 'master'

[David Zeuthen]

 hald/debug-hald.sh    |   10 +++++++++-
 hald/valgrind-hald.sh |   10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

New commits:
diff-tree a914508956fdf66c232b41eec4ba3bd7779701fc (from 3cfc81b52931009aad2dd2115374233ab212b968)
Author: David Zeuthen <davidz at redhat.com>
Date:   Sun Mar 4 12:16:00 2007 -0500

    fix up debug- and valgrind- scripts to actually work

diff --git a/hald/debug-hald.sh b/hald/debug-hald.sh
index 379ff49..249b3dd 100755
--- a/hald/debug-hald.sh
+++ b/hald/debug-hald.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+information_fdidir="../../hal-info/fdi"
+
 case `uname -s` in
     FreeBSD)	backend=freebsd ;;
     SunOS)	backend=solaris ;;
@@ -12,7 +14,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
diff --git a/hald/valgrind-hald.sh b/hald/valgrind-hald.sh
index 28bd581..9fe4b7e 100755
--- a/hald/valgrind-hald.sh
+++ b/hald/valgrind-hald.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+information_fdidir="../../hal-info/fdi"
+
 case `uname -s` in
     FreeBSD)	backend=freebsd ;;
     SunOS)	backend=solaris ;;
@@ -12,7 +14,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