1.1 --- a/BitKeeper/etc/ignore	Tue Nov 02 18:43:36 2004 +0000
     1.2 +++ b/BitKeeper/etc/ignore	Tue Nov 02 21:00:50 2004 +0000
     1.3 @@ -42,7 +42,7 @@ docs/user/labels.pl
     1.4  docs/user/user.css
     1.5  docs/user/user.html
     1.6  extras/mini-os/h/hypervisor-ifs
     1.7 -install/*
     1.8 +dist/*
     1.9  linux-*-xen0/*
    1.10  linux-*-xenU/*
    1.11  linux-xen-sparse

     2.1 --- a/Makefile	Tue Nov 02 18:43:36 2004 +0000
     2.2 +++ b/Makefile	Tue Nov 02 21:00:50 2004 +0000
     2.3 @@ -2,13 +2,14 @@
     2.4  # Grand Unified Makefile for Xen.
     2.5  #
     2.6  
     2.7 -INSTALL_DIR ?= $(shell pwd)/install
     2.8 +DIST_DIR    ?= $(shell pwd)/dist
     2.9 +INSTALL_DIR ?= $(DIST_DIR)/install
    2.10  
    2.11  SOURCEFORGE_MIRROR := http://heanet.dl.sourceforge.net/sourceforge
    2.12  #http://voxel.dl.sourceforge.net/sourceforge/
    2.13  #http://easynews.dl.sourceforge.net/sourceforge
    2.14  
    2.15 -.PHONY: docs delete-symlinks clean
    2.16 +.PHONY: docs delete-symlinks clean all install dist
    2.17  
    2.18  # a not partcularly useful but safe default target
    2.19  all:
    2.20 @@ -22,13 +23,16 @@ install: dist
    2.21  	$(MAKE) -C xen install
    2.22  	$(MAKE) -C tools install
    2.23  	sh ./docs/check_pkgs && $(MAKE) -C docs install
    2.24 -	$(shell cp -dR install/boot/*$(LINUX_VER)* /boot/)
    2.25 -	$(shell cp -dR install/lib/modules/* /lib/modules/)
    2.26 +	$(shell cp -dR $(INSTALL_DIR)/boot/*$(LINUX_VER)* $(prefix)/boot/)
    2.27 +	$(shell cp -dR $(INSTALL_DIR)/lib/modules/* $(prefix)/lib/modules/)
    2.28  
    2.29  # install xen and tools into the install directory
    2.30  dist: all
    2.31  	$(MAKE) linux-xenU
    2.32  	$(MAKE) linux-xen0
    2.33 +	install -m0644 ./COPYING $(DIST_DIR)
    2.34 +	install -m0644 ./README $(DIST_DIR)
    2.35 +	install -m0755 ./install.sh $(DIST_DIR)
    2.36  
    2.37  LINUX_RELEASE    ?= 2.6
    2.38  LINUX_VER        ?= $(shell ( /bin/ls -ld linux-$(LINUX_RELEASE).*-xen-sparse ) 2>/dev/null | \
    2.39 @@ -202,7 +206,7 @@ clean:
    2.40  
    2.41  # clean, but blow away linux build tree plus src tar ball
    2.42  mrproper: clean
    2.43 -	rm -rf install/* patches $(LINUX_TREES) linux-$(LINUX_VER).tar.*
    2.44 +	rm -rf dist patches $(LINUX_TREES) linux-$(LINUX_VER).tar.*
    2.45  
    2.46  install-twisted:
    2.47  	wget http://www.twistedmatrix.com/products/get-current.epy

     3.1 --- a/install.sh	Tue Nov 02 18:43:36 2004 +0000
     3.2 +++ b/install.sh	Tue Nov 02 21:00:50 2004 +0000
     3.3 @@ -1,24 +1,29 @@
     3.4  #!/bin/sh
     3.5  
     3.6 -if ! [ -d ./install ]; then
     3.7 -  echo "ERROR: You must build Xen before it can be installed."
     3.8 -  echo "       For example, 'make dist'."
     3.9 +src='./install'
    3.10 +if [ -d ./dist ]; then
    3.11 +  src='./dist/install'
    3.12 +fi
    3.13 +
    3.14 +if ! [ -d $src ]; then
    3.15 +  echo "ERROR: Could not find a valid distribution directory."
    3.16 +  echo "       If this is a source-only release, try 'make dist'."
    3.17    exit 1
    3.18  fi
    3.19  
    3.20 -prefix='/'
    3.21 +dst='/'
    3.22  if [ $# -ne 0 ]; then 
    3.23 -  prefix=$1
    3.24 +  dst=$1
    3.25  fi
    3.26  
    3.27 -if ! [ -d $prefix ]; then
    3.28 +if ! [ -d $dst ]; then
    3.29    echo "ERROR: You must specify a valid install directory."
    3.30 -  echo "       The specified directory '$prefix' is not valid."
    3.31 +  echo "       The specified directory '$dst' is not valid."
    3.32    exit 1
    3.33  fi
    3.34  
    3.35 -echo "Installing Xen to '$prefix'..."
    3.36 -cp -fdR ./install/* $prefix
    3.37 +echo "Installing Xen from '$src' to '$dst'..."
    3.38 +cp -fdR $src/* $dst
    3.39  echo "All done."
    3.40  
    3.41  exit 0