bitkeeper revision 1.1159.1.378 (418aa2bc6DI3-OOtFpoHiZyoyBtfCg)

Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/anfs/scratch/labyrinth/iap10/xeno-clone/xeno.bk

3 files changed, 8 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index 3788496161..ef17e6880f 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,8 @@ dist:	xen tools kernels docs
 	install -m0644 ./COPYING $(DIST_DIR)
 	install -m0644 ./README $(DIST_DIR)
 	install -m0755 ./install.sh $(DIST_DIR)
+	mkdir -p $(DIST_DIR)/check
+	cp tools/check/chk /tools/check/check_* $(DIST_DIR)/check
 
 # install everything into the standard system directories
 # NB: install explicitly does not check that everything is up to date!
diff --git a/install.sh b/install.sh
index 6e12009660..f21294f5f7 100755
--- a/install.sh
+++ b/install.sh
@@ -26,4 +26,9 @@ echo "Installing Xen from '$src' to '$dst'..."
 cp -fdR $src/* $dst
 echo "All done."
 
+echo "Checking to see whether prerequisite tools are installed..."
+cd $src/../check
+./chk install
+echo "All done."
+
 exit 0
diff --git a/tools/check/chk b/tools/check/chk
index 16de110bc1..0ebce4799e 100755
--- a/tools/check/chk
+++ b/tools/check/chk
@@ -63,7 +63,7 @@ done
 echo >> ${info}
 
 if [ "$failed" == "1" ] ; then
-    echo "Checks failed. See ${info} for details."
+    echo "Checks failed. See `pwd`/${info} for details."
     echo "FAILED" >> ${info}
     exit 1
 else