ia64/xen-unstable

changeset 2896:622f60f46a5a

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
author iap10@labyrinth.cl.cam.ac.uk
date Thu Nov 04 21:44:28 2004 +0000 (2004-11-04)
parents d3b6b1e5825c 0d70a2747177
children a96369f318e2
files Makefile install.sh tools/check/chk
line diff
     1.1 --- a/Makefile	Thu Nov 04 21:31:02 2004 +0000
     1.2 +++ b/Makefile	Thu Nov 04 21:44:28 2004 +0000
     1.3 @@ -27,6 +27,8 @@ dist:	xen tools kernels docs
     1.4  	install -m0644 ./COPYING $(DIST_DIR)
     1.5  	install -m0644 ./README $(DIST_DIR)
     1.6  	install -m0755 ./install.sh $(DIST_DIR)
     1.7 +	mkdir -p $(DIST_DIR)/check
     1.8 +	cp tools/check/chk /tools/check/check_* $(DIST_DIR)/check
     1.9  
    1.10  # install everything into the standard system directories
    1.11  # NB: install explicitly does not check that everything is up to date!
     2.1 --- a/install.sh	Thu Nov 04 21:31:02 2004 +0000
     2.2 +++ b/install.sh	Thu Nov 04 21:44:28 2004 +0000
     2.3 @@ -26,4 +26,9 @@ echo "Installing Xen from '$src' to '$ds
     2.4  cp -fdR $src/* $dst
     2.5  echo "All done."
     2.6  
     2.7 +echo "Checking to see whether prerequisite tools are installed..."
     2.8 +cd $src/../check
     2.9 +./chk install
    2.10 +echo "All done."
    2.11 +
    2.12  exit 0
     3.1 --- a/tools/check/chk	Thu Nov 04 21:31:02 2004 +0000
     3.2 +++ b/tools/check/chk	Thu Nov 04 21:44:28 2004 +0000
     3.3 @@ -63,7 +63,7 @@ done
     3.4  echo >> ${info}
     3.5  
     3.6  if [ "$failed" == "1" ] ; then
     3.7 -    echo "Checks failed. See ${info} for details."
     3.8 +    echo "Checks failed. See `pwd`/${info} for details."
     3.9      echo "FAILED" >> ${info}
    3.10      exit 1
    3.11  else