diff -Naur xen-2.0/ChangeLog xen-2.0-new/ChangeLog
--- xen-2.0/ChangeLog	2005-02-04 14:38:39.000000000 +0100
+++ xen-2.0-new/ChangeLog	2005-02-19 02:44:58.783307296 +0100
@@ -198,9 +198,9 @@
   Signed-off-by: ian.pratt@cl.cam.ac.uk
 
 ChangeSet@1.1676, 2005-01-22 22:03:34+00:00, iap10@labyrinth.cl.cam.ac.uk
-  Description: use DESTDIR correctly
+  Description: use XENDESTDIR correctly
   Standard makefiles always attempt to install to the root(/).  Setting
-  DESTDIR is the normal way to install to an alternative location.
+  XENDESTDIR is the normal way to install to an alternative location.
   Setting prefix has the possibility of breaking programs, as the prefix
   may have been embedded inside a compiled binary.
   
diff -Naur xen-2.0/Makefile xen-2.0-new/Makefile
--- xen-2.0/Makefile	2005-02-04 14:38:38.000000000 +0100
+++ xen-2.0-new/Makefile	2005-02-19 02:45:45.409219080 +0100
@@ -3,8 +3,8 @@
 #
 
 # Default is to install to local 'dist' directory.
-DISTDIR ?= $(CURDIR)/dist
-DESTDIR ?= $(DISTDIR)/install
+XENDISTDIR ?= $(CURDIR)/dist
+XENDESTDIR ?= $(XENDISTDIR)/install
 
 INSTALL		:= install
 INSTALL_DIR	:= $(INSTALL) -d -m0755
@@ -19,7 +19,7 @@
 ALLSPARSETREES = $(patsubst %-xen-sparse,%,$(wildcard *-xen-sparse))
 XKERNELS := $(foreach kernel, $(KERNELS), $(patsubst buildconfigs/mk.%,%,$(wildcard buildconfigs/mk.$(kernel))) )
 
-export DESTDIR
+export XENDESTDIR
 
 # Export target architecture overrides to Xen and Linux sub-trees.
 ifneq ($(TARGET_ARCH),)
@@ -39,11 +39,11 @@
 
 # build and install everything into local dist directory
 dist: xen tools kernels docs
-	$(INSTALL_DIR) $(DISTDIR)/check
-	$(INSTALL_DATA) ./COPYING $(DISTDIR)
-	$(INSTALL_DATA) ./README $(DISTDIR)
-	$(INSTALL_PROG) ./install.sh $(DISTDIR)
-	$(INSTALL_PROG) tools/check/chk tools/check/check_* $(DISTDIR)/check
+	$(INSTALL_DIR) $(XENDISTDIR)/check
+	$(INSTALL_DATA) ./COPYING $(XENDISTDIR)
+	$(INSTALL_DATA) ./README $(XENDISTDIR)
+	$(INSTALL_PROG) ./install.sh $(XENDISTDIR)
+	$(INSTALL_PROG) tools/check/chk tools/check/check_* $(XENDISTDIR)/check
 
 xen:
 	$(MAKE) -C xen install
@@ -110,7 +110,7 @@
 	tar -jxf iptables-1.2.11.tar.bz2
 	$(MAKE) -C iptables-1.2.11 PREFIX= KERNEL_DIR=../linux-$(LINUX_VER)-xen0 install
 
-install-%: DESTDIR=
+install-%: XENDESTDIR=
 install-%: %
 	@: # do nothing
 
@@ -152,8 +152,8 @@
 	@echo '                     with extreme care!)'
 
 # Use this target with extreme care!
-uninstall: DESTDIR=
-uninstall: D=$(DESTDIR)
+uninstall: XENDESTDIR=
+uninstall: D=$(XENDESTDIR)
 uninstall:
 	[ ! -d $(D)/etc/xen ] || mv -f $(D)/etc/xen $(D)/etc/xen.old
 	rm -rf $(D)/etc/init.d/xend*
diff -Naur xen-2.0/buildconfigs/Rules.mk xen-2.0-new/buildconfigs/Rules.mk
--- xen-2.0/buildconfigs/Rules.mk	2005-02-04 14:38:36.000000000 +0100
+++ xen-2.0-new/buildconfigs/Rules.mk	2005-02-19 02:45:45.408219232 +0100
@@ -1,8 +1,8 @@
 
 # We expect these two to already be set if people 
 # are using the top-level Makefile
-DISTDIR	?= $(CURDIR)/dist
-DESTDIR	?= $(DISTDIR)/install
+XENDISTDIR	?= $(CURDIR)/dist
+XENDESTDIR	?= $(XENDISTDIR)/install
 
 .PHONY:	mkpatches mrproper
 
diff -Naur xen-2.0/buildconfigs/mk.linux-2.4-xen0 xen-2.0-new/buildconfigs/mk.linux-2.4-xen0
--- xen-2.0/buildconfigs/mk.linux-2.4-xen0	2005-02-04 14:38:29.000000000 +0100
+++ xen-2.0-new/buildconfigs/mk.linux-2.4-xen0	2005-02-19 02:44:58.757311248 +0100
@@ -15,9 +15,9 @@
 build: $(LINUX_DIR)/include/linux/autoconf.h
 	if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \
 	    $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \
-	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \
+	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(XENDESTDIR) modules_install ; \
 	fi
-	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install
+	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(XENDESTDIR) install
 
 patches/tmp/ebtables.diff:
 	mkdir -p patches/tmp
@@ -37,8 +37,8 @@
 	# add ebtables patch
 	( cd $(LINUX_DIR) ; patch -p1 -F3 < ../patches/tmp/ebtables.diff )
 	# Re-use config from install dir if one exits else use default config
-	[ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \
-	  cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
+	[ -r $(XENDESTDIR)/boot/config-$(FULLVERSION) ] && \
+	  cp $(XENDESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
 	  || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \
 		$(LINUX_DIR)/.config
 	make -C $(LINUX_DIR) ARCH=xen oldconfig
diff -Naur xen-2.0/buildconfigs/mk.linux-2.4-xenU xen-2.0-new/buildconfigs/mk.linux-2.4-xenU
--- xen-2.0/buildconfigs/mk.linux-2.4-xenU	2005-02-04 14:38:38.000000000 +0100
+++ xen-2.0-new/buildconfigs/mk.linux-2.4-xenU	2005-02-19 02:44:58.758311096 +0100
@@ -15,9 +15,9 @@
 build: $(LINUX_DIR)/include/linux/autoconf.h
 	if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \
 	    $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \
-	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \
+	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(XENDESTDIR) modules_install ; \
 	fi
-	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install
+	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(XENDESTDIR) install
 
 $(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)
 	rm -rf $(LINUX_DIR)
@@ -30,8 +30,8 @@
 	  sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
 	  rm -f Makefile ; mv Mk.tmp Makefile )
 	# Re-use config from install dir if one exits else use default config
-	[ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \
-	  cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
+	[ -r $(XENDESTDIR)/boot/config-$(FULLVERSION) ] && \
+	  cp $(XENDESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
 	  || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \
 		$(LINUX_DIR)/.config
 	make -C $(LINUX_DIR) ARCH=xen oldconfig
diff -Naur xen-2.0/buildconfigs/mk.linux-2.6-xen0 xen-2.0-new/buildconfigs/mk.linux-2.6-xen0
--- xen-2.0/buildconfigs/mk.linux-2.6-xen0	2005-02-04 14:38:39.000000000 +0100
+++ xen-2.0-new/buildconfigs/mk.linux-2.6-xen0	2005-02-19 02:44:58.758311096 +0100
@@ -15,9 +15,9 @@
 build: $(LINUX_DIR)/include/linux/autoconf.h
 	if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \
 	    $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \
-	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \
+	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(XENDESTDIR) modules_install ; \
 	fi
-	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install
+	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(XENDESTDIR) install
 
 $(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)
 	rm -rf $(LINUX_DIR)
@@ -30,8 +30,8 @@
 	  sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
 	  rm -f Makefile ; mv Mk.tmp Makefile )
 	# Re-use config from install dir if one exits else use default config
-	[ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \
-	  cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
+	[ -r $(XENDESTDIR)/boot/config-$(FULLVERSION) ] && \
+	  cp $(XENDESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
 	  || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \
 		$(LINUX_DIR)/.config
 	$(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig
diff -Naur xen-2.0/buildconfigs/mk.linux-2.6-xenU xen-2.0-new/buildconfigs/mk.linux-2.6-xenU
--- xen-2.0/buildconfigs/mk.linux-2.6-xenU	2005-02-04 14:38:38.000000000 +0100
+++ xen-2.0-new/buildconfigs/mk.linux-2.6-xenU	2005-02-19 02:44:58.758311096 +0100
@@ -15,9 +15,9 @@
 build: $(LINUX_DIR)/include/linux/autoconf.h
 	if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \
 	    $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \
-	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \
+	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(XENDESTDIR) modules_install ; \
 	fi
-	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install
+	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(XENDESTDIR) install
 
 $(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)
 	rm -rf $(LINUX_DIR)
@@ -30,8 +30,8 @@
 	  sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
 	  rm -f Makefile ; mv Mk.tmp Makefile )
 	# Re-use config from install dir if one exits else use default config
-	[ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \
-	  cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
+	[ -r $(XENDESTDIR)/boot/config-$(FULLVERSION) ] && \
+	  cp $(XENDESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
 	  || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \
 		$(LINUX_DIR)/.config
 	$(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig
diff -Naur xen-2.0/buildconfigs/mk.netbsd-2.0-xenU xen-2.0-new/buildconfigs/mk.netbsd-2.0-xenU
--- xen-2.0/buildconfigs/mk.netbsd-2.0-xenU	2005-02-04 14:38:35.000000000 +0100
+++ xen-2.0-new/buildconfigs/mk.netbsd-2.0-xenU	2005-02-19 02:44:58.757311248 +0100
@@ -34,7 +34,7 @@
 netbsd-xen%: $(NETBSD_DIR)/.valid netbsd-$(NETBSD_RELEASE)-tools
 	$(MAKE) -C netbsd-$(FULLVERSION) config
 	$(MAKE) -C netbsd-$(FULLVERSION) netbsd
-	$(MAKE) -C netbsd-$(FULLVERSION) INSTALL_PATH=$(DESTDIR) INSTALL_NAME=boot/netbsd-$(NETBSD_VER)-xen$* install
+	$(MAKE) -C netbsd-$(FULLVERSION) INSTALL_PATH=$(XENDESTDIR) INSTALL_NAME=boot/netbsd-$(NETBSD_VER)-xen$* install
 
 clean:
 	$(MAKE) -C netbsd-$(FULLVERSION) clean
diff -Naur xen-2.0/docs/Makefile xen-2.0-new/docs/Makefile
--- xen-2.0/docs/Makefile	2005-02-04 14:38:38.000000000 +0100
+++ xen-2.0-new/docs/Makefile	2005-02-19 02:44:58.759310944 +0100
@@ -35,11 +35,11 @@
 	rm -rf $(GFX) ps pdf html
 
 install: all
-	rm -rf $(DESTDIR)$(pkgdocdir)
-	$(INSTALL_DIR) $(DESTDIR)$(pkgdocdir)
-	cp -dR ps $(DESTDIR)$(pkgdocdir)
-	cp -dR pdf $(DESTDIR)$(pkgdocdir)
-	cp -dR html $(DESTDIR)$(pkgdocdir)
+	rm -rf $(XENDESTDIR)$(pkgdocdir)
+	$(INSTALL_DIR) $(XENDESTDIR)$(pkgdocdir)
+	cp -dR ps $(XENDESTDIR)$(pkgdocdir)
+	cp -dR pdf $(XENDESTDIR)$(pkgdocdir)
+	cp -dR html $(XENDESTDIR)$(pkgdocdir)
 
 pdf/%.pdf: ps/%.ps
 	$(INSTALL_DIR) $(@D)
diff -Naur xen-2.0/linux-2.4.29-xen-sparse/drivers/scsi/aic7xxx/Makefile xen-2.0-new/linux-2.4.29-xen-sparse/drivers/scsi/aic7xxx/Makefile
--- xen-2.0/linux-2.4.29-xen-sparse/drivers/scsi/aic7xxx/Makefile	2005-02-04 14:38:34.000000000 +0100
+++ xen-2.0-new/linux-2.4.29-xen-sparse/drivers/scsi/aic7xxx/Makefile	2005-02-19 02:44:58.756311400 +0100
@@ -49,7 +49,7 @@
 endif
 
 # Override our module desitnation
-MOD_DESTDIR = $(shell cd .. && $(CONFIG_SHELL) $(TOPDIR)/scripts/pathdown.sh)
+MOD_XENDESTDIR = $(shell cd .. && $(CONFIG_SHELL) $(TOPDIR)/scripts/pathdown.sh)
 
 include $(TOPDIR)/Rules.make
 
diff -Naur xen-2.0/netbsd-2.0-xen-sparse/nbmake-xen xen-2.0-new/netbsd-2.0-xen-sparse/nbmake-xen
--- xen-2.0/netbsd-2.0-xen-sparse/nbmake-xen	2005-02-04 14:38:34.000000000 +0100
+++ xen-2.0-new/netbsd-2.0-xen-sparse/nbmake-xen	2005-02-19 02:44:58.759310944 +0100
@@ -16,7 +16,7 @@
 esac
 
 NETBSDSRCDIR="$TOPDIR"; export NETBSDSRCDIR
-DESTDIR="$TOPDIR/root"; export DESTDIR
+XENDESTDIR="$TOPDIR/root"; export XENDESTDIR
 unset MAKEOBJDIRPREFIX
 MAKEOBJDIR='${.CURDIR:C,^'"$TOPDIR,$TOPDIR/obj,}"; export MAKEOBJDIR
 RELEASEDIR="$TOPDIR/release"; export RELEASEDIR
diff -Naur xen-2.0/tools/examples/Makefile xen-2.0-new/tools/examples/Makefile
--- xen-2.0/tools/examples/Makefile	2005-02-04 14:38:39.000000000 +0100
+++ xen-2.0-new/tools/examples/Makefile	2005-02-19 03:14:02.706190720 +0100
@@ -1,3 +1,6 @@
+# Default is to install to local 'dist' directory.
+XENDISTDIR ?= ../dist
+XENDESTDIR ?= $(XENDISTDIR)/install
 INSTALL		= install
 INSTALL_DIR	= $(INSTALL) -d -m0755
 INSTALL_PROG	= $(INSTALL) -m0755
@@ -25,26 +28,26 @@
 install: all install-initd install-configs install-scripts
 
 install-initd:
-	[ -d $(DESTDIR)/etc/init.d ] || $(INSTALL_DIR) $(DESTDIR)/etc/init.d
-	$(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)/etc/init.d
-	$(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)/etc/init.d
+	[ -d $(XENDESTDIR)/etc/init.d ] || $(INSTALL_DIR) $(XENDESTDIR)/etc/init.d
+	$(INSTALL_PROG) $(XEND_INITD) $(XENDESTDIR)/etc/init.d
+	$(INSTALL_PROG) $(XENDOMAINS_INITD) $(XENDESTDIR)/etc/init.d
 
 install-configs:
-	[ -d $(DESTDIR)$(XEN_CONFIG_DIR) ] || \
-		$(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR)
-	[ -d $(DESTDIR)$(XEN_CONFIG_DIR)/auto ] || \
-		$(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR)/auto
+	[ -d $(XENDESTDIR)$(XEN_CONFIG_DIR) ] || \
+		$(INSTALL_DIR) $(XENDESTDIR)$(XEN_CONFIG_DIR)
+	[ -d $(XENDESTDIR)$(XEN_CONFIG_DIR)/auto ] || \
+		$(INSTALL_DIR) $(XENDESTDIR)$(XEN_CONFIG_DIR)/auto
 	for i in $(XEN_CONFIGS); \
-	    do [ -a $(DESTDIR)$(XEN_CONFIG_DIR)/$$i ] || \
-	    $(INSTALL_DATA) $$i $(DESTDIR)$(XEN_CONFIG_DIR); \
+	    do [ -a $(XENDESTDIR)$(XEN_CONFIG_DIR)/$$i ] || \
+	    $(INSTALL_DATA) $$i $(XENDESTDIR)$(XEN_CONFIG_DIR); \
 	done
 
 install-scripts:
-	[ -d $(DESTDIR)$(XEN_SCRIPT_DIR) ] || \
-		$(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR)
+	[ -d $(XENDESTDIR)$(XEN_SCRIPT_DIR) ] || \
+		$(INSTALL_DIR) $(XENDESTDIR)$(XEN_SCRIPT_DIR)
 	for i in $(XEN_SCRIPTS); \
-	    do [ -a $(DESTDIR)$(XEN_SCRIPT_DIR)/$$i ] || \
-	    $(INSTALL_PROG) $$i $(DESTDIR)$(XEN_SCRIPT_DIR); \
+	    do [ -a $(XENDESTDIR)$(XEN_SCRIPT_DIR)/$$i ] || \
+	    $(INSTALL_PROG) $$i $(XENDESTDIR)$(XEN_SCRIPT_DIR); \
 	done
 
 clean:
diff -Naur xen-2.0/tools/libxc/Makefile xen-2.0-new/tools/libxc/Makefile
--- xen-2.0/tools/libxc/Makefile	2005-02-04 14:38:29.000000000 +0100
+++ xen-2.0-new/tools/libxc/Makefile	2005-02-19 03:13:28.122448248 +0100
@@ -1,3 +1,6 @@
+# Default is to install to local 'dist' directory.
+XENDISTDIR ?= ../dist
+XENDESTDIR ?= $(XENDISTDIR)/install
 INSTALL		= install
 INSTALL_PROG	= $(INSTALL) -m0755
 INSTALL_DATA	= $(INSTALL) -m0644
@@ -66,12 +69,12 @@
 	  ln -sf ../../$(LINUX_ROOT)/include/asm-xen/linux-public/*.h . )
 
 install: all
-	[ -d $(DESTDIR)/usr/lib ] || $(INSTALL_DIR) $(DESTDIR)/usr/lib
-	[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
-	$(INSTALL_PROG) libxc.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib
-	ln -sf libxc.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib/libxc.so.$(MAJOR)
-	ln -sf libxc.so.$(MAJOR) $(DESTDIR)/usr/lib/libxc.so
-	$(INSTALL_DATA) xc.h $(DESTDIR)/usr/include
+	[ -d $(XENDESTDIR)/usr/lib ] || $(INSTALL_DIR) $(XENDESTDIR)/usr/lib
+	[ -d $(XENDESTDIR)/usr/include ] || $(INSTALL_DIR) $(XENDESTDIR)/usr/include
+	$(INSTALL_PROG) libxc.so.$(MAJOR).$(MINOR) $(XENDESTDIR)/usr/lib
+	ln -sf libxc.so.$(MAJOR).$(MINOR) $(XENDESTDIR)/usr/lib/libxc.so.$(MAJOR)
+	ln -sf libxc.so.$(MAJOR) $(XENDESTDIR)/usr/lib/libxc.so
+	$(INSTALL_DATA) xc.h $(XENDESTDIR)/usr/include
 
 clean:
 	rm -rf *.a *.so *.o *.rpm $(LIB) *~ $(DEPS) xen
diff -Naur xen-2.0/tools/libxutil/Makefile xen-2.0-new/tools/libxutil/Makefile
--- xen-2.0/tools/libxutil/Makefile	2005-02-04 14:38:36.000000000 +0100
+++ xen-2.0-new/tools/libxutil/Makefile	2005-02-19 03:09:46.763099984 +0100
@@ -1,3 +1,6 @@
+# Default is to install to local 'dist' directory.
+XENDISTDIR ?= ../dist
+XENDESTDIR ?= $(XENDISTDIR)/install
 XEN_ROOT = ../..
 INSTALL		= install
 INSTALL_DATA	= $(INSTALL) -m0644
@@ -63,10 +66,10 @@
 	fi
 
 install: all
-	[ -d $(DESTDIR)/usr/lib ] || $(INSTALL_DIR) -p $(DESTDIR)/usr/lib
-	$(INSTALL_PROG) $(LIB_NAME).so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib
-	ln -sf $(LIB_NAME).so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib/$(LIB_NAME).so.$(MAJOR)
-	ln -sf $(LIB_NAME).so.$(MAJOR) $(DESTDIR)/usr/lib/$(LIB_NAME).so
+	[ -d $(XENDESTDIR)/usr/lib ] || $(INSTALL_DIR) -p $(XENDESTDIR)/usr/lib
+	$(INSTALL_PROG) $(LIB_NAME).so.$(MAJOR).$(MINOR) $(XENDESTDIR)/usr/lib
+	ln -sf $(LIB_NAME).so.$(MAJOR).$(MINOR) $(XENDESTDIR)/usr/lib/$(LIB_NAME).so.$(MAJOR)
+	ln -sf $(LIB_NAME).so.$(MAJOR) $(XENDESTDIR)/usr/lib/$(LIB_NAME).so
 
 clean:
 	$(RM) *.a *.so *.so.* *.o *.rpm 
diff -Naur xen-2.0/tools/misc/Makefile xen-2.0-new/tools/misc/Makefile
--- xen-2.0/tools/misc/Makefile	2005-02-04 14:38:34.000000000 +0100
+++ xen-2.0-new/tools/misc/Makefile	2005-02-19 03:14:20.982412312 +0100
@@ -1,3 +1,6 @@
+# Default is to install to local 'dist' directory.
+XENDISTDIR ?= ../dist
+XENDESTDIR ?= $(XENDISTDIR)/install
 INSTALL		= install
 INSTALL_PROG	= $(INSTALL) -m0755
 INSTALL_DIR	= $(INSTALL) -d -m0755
@@ -23,10 +26,10 @@
 	$(MAKE) -C miniterm
 
 install: all
-	[ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
-	[ -d $(DESTDIR)/usr/sbin ] || $(INSTALL_DIR) $(DESTDIR)/usr/sbin
-	$(INSTALL_PROG) $(INSTALL_BIN) $(DESTDIR)/usr/bin
-	$(INSTALL_PROG) $(INSTALL_SBIN) $(DESTDIR)/usr/sbin
+	[ -d $(XENDESTDIR)/usr/bin ] || $(INSTALL_DIR) $(XENDESTDIR)/usr/bin
+	[ -d $(XENDESTDIR)/usr/sbin ] || $(INSTALL_DIR) $(XENDESTDIR)/usr/sbin
+	$(INSTALL_PROG) $(INSTALL_BIN) $(XENDESTDIR)/usr/bin
+	$(INSTALL_PROG) $(INSTALL_SBIN) $(XENDESTDIR)/usr/sbin
 #       No sense in installing miniterm on the Xen box.
 #	$(MAKE) -C miniterm install
 
diff -Naur xen-2.0/tools/misc/miniterm/Makefile xen-2.0-new/tools/misc/miniterm/Makefile
--- xen-2.0/tools/misc/miniterm/Makefile	2005-02-04 14:38:32.000000000 +0100
+++ xen-2.0-new/tools/misc/miniterm/Makefile	2005-02-19 03:22:37.567919840 +0100
@@ -1,3 +1,6 @@
+# Default is to install to local 'dist' directory.
+XENDISTDIR ?= ../dist
+XENDESTDIR ?= $(XENDISTDIR)/install
 INSTALL		= install
 INSTALL_PROG	= $(INSTALL) -m0755
 INSTALL_DIR	= $(INSTALL) -d -m0755
@@ -9,8 +12,8 @@
 all: $(TARGET)
 
 install: all
-	[ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
-	$(INSTALL_PROG) $(TARGET) $(DESTDIR)/usr/bin
+	[ -d $(XENDESTDIR)/usr/bin ] || $(INSTALL_DIR) $(XENDESTDIR)/usr/bin
+	$(INSTALL_PROG) $(TARGET) $(XENDESTDIR)/usr/bin
 
 clean:
 	$(RM) *.o $(TARGET) *~
diff -Naur xen-2.0/tools/python/Makefile xen-2.0-new/tools/python/Makefile
--- xen-2.0/tools/python/Makefile	2005-02-04 14:38:30.000000000 +0100
+++ xen-2.0-new/tools/python/Makefile	2005-02-19 03:20:57.539126528 +0100
@@ -1,4 +1,6 @@
-
+# Default is to install to local 'dist' directory.
+XENDISTDIR ?= ../dist
+XENDESTDIR ?= $(XENDISTDIR)/install
 XEN_ROOT = ../..
 include $(XEN_ROOT)/tools/Rules.mk
 
@@ -6,7 +8,7 @@
 	CFLAGS="$(CFLAGS)" python setup.py build
 
 install: all
-	CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)/usr"
+	CFLAGS="$(CFLAGS)" python setup.py install --home="$(XENDESTDIR)/usr"
 
 clean:
 	rm -rf build *.pyc *.pyo *.o *.a *~
diff -Naur xen-2.0/tools/sv/Makefile xen-2.0-new/tools/sv/Makefile
--- xen-2.0/tools/sv/Makefile	2005-02-04 14:38:31.000000000 +0100
+++ xen-2.0-new/tools/sv/Makefile	2005-02-19 11:13:29.583780472 +0100
@@ -1,3 +1,6 @@
+# Default is to install to local 'dist' directory.
+XENDISTDIR ?= ../../dist
+XENDESTDIR ?= $(XENDISTDIR)/install
 sv_insdir := /var/lib/xen/sv
 INSTALL		= install
 INSTALL_DIR	= $(INSTALL) -d -m0755
@@ -17,18 +20,18 @@
 
 install:
 	# copy XenSV Main.rpy file
-	@[ -d $(DESTDIR)$(sv_insdir) ] || $(INSTALL_DIR) $(DESTDIR)$(sv_insdir)
-	@$(INSTALL_DATA) Main.rpy $(DESTDIR)$(sv_insdir)
+	@[ -d $(XENDESTDIR)$(sv_insdir) ] || $(INSTALL_DIR) $(XENDESTDIR)$(sv_insdir)
+	@$(INSTALL_DATA) Main.rpy $(XENDESTDIR)$(sv_insdir)
 
 	# copy XenSV images
-	@[ -d $(DESTDIR)$(sv_insdir)/images ] || \
-		$(INSTALL_DIR) $(DESTDIR)$(sv_insdir)/images
-	@(cd images && $(INSTALL_DATA) $(IMAGES) $(DESTDIR)$(sv_insdir)/images)
+	@[ -d $(XENDESTDIR)$(sv_insdir)/images ] || \
+		$(INSTALL_DIR) $(XENDESTDIR)$(sv_insdir)/images
+	# @(cd images && $(INSTALL_DATA) $(IMAGES) $(XENDESTDIR)$(sv_insdir)/images)
 
 	# copy XenSV stylesheet
-	@[ -d $(DESTDIR)$(sv_insdir)/inc ] || \
-		$(INSTALL_DIR) $(DESTDIR)$(sv_insdir)/inc
-	@$(INSTALL_DATA) inc/style.css inc/script.js $(DESTDIR)$(sv_insdir)/inc
+	@[ -d $(XENDESTDIR)$(sv_insdir)/inc ] || \
+		$(INSTALL_DIR) $(XENDESTDIR)$(sv_insdir)/inc
+	@$(INSTALL_DATA) inc/style.css inc/script.js $(XENDESTDIR)$(sv_insdir)/inc
 
 clean:
 
diff -Naur xen-2.0/tools/vnet/examples/Makefile xen-2.0-new/tools/vnet/examples/Makefile
--- xen-2.0/tools/vnet/examples/Makefile	2005-02-04 14:38:39.000000000 +0100
+++ xen-2.0-new/tools/vnet/examples/Makefile	2005-02-19 02:44:58.755311552 +0100
@@ -6,7 +6,7 @@
 all:
 
 install:
-	install -m 0755 -d $(DESTDIR)$(XEN_SCRIPT_DIR)
-	install -m 0554 network-vnet $(DESTDIR)$(XEN_SCRIPT_DIR)
+	install -m 0755 -d $(XENDESTDIR)$(XEN_SCRIPT_DIR)
+	install -m 0554 network-vnet $(XENDESTDIR)$(XEN_SCRIPT_DIR)
 
 clean:
\ No newline at end of file
diff -Naur xen-2.0/tools/vnet/vnet-module/Makefile-2.4 xen-2.0-new/tools/vnet/vnet-module/Makefile-2.4
--- xen-2.0/tools/vnet/vnet-module/Makefile-2.4	2005-02-04 14:38:36.000000000 +0100
+++ xen-2.0-new/tools/vnet/vnet-module/Makefile-2.4	2005-02-19 03:25:26.609221656 +0100
@@ -32,6 +32,10 @@
 
 VNET_OBJ += $(VNET_LIB_OBJ)
 
+# Default is to install to local 'dist' directory.
+XENDISTDIR ?= ../dist
+XENDESTDIR ?= $(XENDISTDIR)/install
+
 #----------------------------------------------------------------------------
 
 vpath %.h $(KERNEL_SRC)/include
@@ -82,8 +86,8 @@
 
 .PHONY: install install-module modules_install
 install install-module modules_install: module
-	install -m 0755 -d $(DESTDIR)$(KERNEL_MODULE_DIR)
-	install -m 0554 $(KERNEL_MODULE) $(DESTDIR)$(KERNEL_MODULE_DIR)
+	install -m 0755 -d $(XENDESTDIR)$(KERNEL_MODULE_DIR)
+	install -m 0554 $(KERNEL_MODULE) $(XENDESTDIR)$(KERNEL_MODULE_DIR)
 
 TAGS:
 	etags *.c *.h
diff -Naur xen-2.0/tools/vnet/vnet-module/Makefile-2.6 xen-2.0-new/tools/vnet/vnet-module/Makefile-2.6
--- xen-2.0/tools/vnet/vnet-module/Makefile-2.6	2005-02-04 14:38:33.000000000 +0100
+++ xen-2.0-new/tools/vnet/vnet-module/Makefile-2.6	2005-02-19 03:24:49.020935944 +0100
@@ -29,6 +29,10 @@
 #----------------------------------------------------------------------------
 #export KBUILD_VERBOSE=1
 
+# Default is to install to local 'dist' directory.
+XENDISTDIR ?= ../dist
+XENDESTDIR ?= $(XENDISTDIR)/install
+
 .PHONY: all
 all: module
 
@@ -38,8 +42,8 @@
 
 .PHONY: install install-module modules_install
 install install-module modules_install: module
-	install -m 0755 -d $(DESTDIR)$(KERNEL_MODULE_DIR)
-	install -m 0554 $(KERNEL_MODULE) $(DESTDIR)$(KERNEL_MODULE_DIR)
+	install -m 0755 -d $(XENDESTDIR)$(KERNEL_MODULE_DIR)
+	install -m 0554 $(KERNEL_MODULE) $(XENDESTDIR)$(KERNEL_MODULE_DIR)
 
 .PHONY: clean
 clean:
diff -Naur xen-2.0/tools/vnet/vnetd/Makefile xen-2.0-new/tools/vnet/vnetd/Makefile
--- xen-2.0/tools/vnet/vnetd/Makefile	2005-02-04 14:38:35.000000000 +0100
+++ xen-2.0-new/tools/vnet/vnetd/Makefile	2005-02-19 03:24:11.338664520 +0100
@@ -20,6 +20,9 @@
 
 #----------------------------------------------------------------------------
 
+# Default is to install to local 'dist' directory.
+XENDISTDIR ?= ../dist
+XENDESTDIR ?= $(XENDISTDIR)/install
 XEN_ROOT  = ../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
@@ -91,8 +94,8 @@
 	$(CC) $(CFLAGS) -o $@ $^ $(VNETD_LIBS) -ldl -lpthread
 
 install: vnetd
-	mkdir -p $(DESTDIR)$(VNETD_INSTALL_DIR)
-	install -m 0755 vnetd $(DESTDIR)$(VNETD_INSTALL_DIR)
+	mkdir -p $(XENDESTDIR)$(VNETD_INSTALL_DIR)
+	install -m 0755 vnetd $(XENDESTDIR)$(VNETD_INSTALL_DIR)
 
 clean:
 	-rm -f *.a *.o *~
diff -Naur xen-2.0/tools/xentrace/Makefile xen-2.0-new/tools/xentrace/Makefile
--- xen-2.0/tools/xentrace/Makefile	2005-02-04 14:38:32.000000000 +0100
+++ xen-2.0-new/tools/xentrace/Makefile	2005-02-19 03:15:41.227213248 +0100
@@ -1,3 +1,6 @@
+# Default is to install to local 'dist' directory.
+XENDISTDIR ?= ../dist
+XENDESTDIR ?= $(XENDISTDIR)/install
 INSTALL		= install
 INSTALL_PROG	= $(INSTALL) -m0755
 INSTALL_DIR	= $(INSTALL) -d -m0755
@@ -24,14 +27,14 @@
 all: $(BIN)
 
 install: all
-	[ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
-	[ -d $(DESTDIR)/usr/man/man1 ] || \
-		$(INSTALL_DIR) $(DESTDIR)/usr/man/man1
-	[ -d $(DESTDIR)/usr/man/man8 ] || \
-		$(INSTALL_DIR) $(DESTDIR)/usr/man/man8
-	$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/bin
-	$(INSTALL_DATA) $(MAN1) $(DESTDIR)/usr/man/man1
-	$(INSTALL_DATA) $(MAN8) $(DESTDIR)/usr/man/man8
+	[ -d $(XENDESTDIR)/usr/bin ] || $(INSTALL_DIR) $(XENDESTDIR)/usr/bin
+	[ -d $(XENDESTDIR)/usr/man/man1 ] || \
+		$(INSTALL_DIR) $(XENDESTDIR)/usr/man/man1
+	[ -d $(XENDESTDIR)/usr/man/man8 ] || \
+		$(INSTALL_DIR) $(XENDESTDIR)/usr/man/man8
+	$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(XENDESTDIR)/usr/bin
+	$(INSTALL_DATA) $(MAN1) $(XENDESTDIR)/usr/man/man1
+	$(INSTALL_DATA) $(MAN8) $(XENDESTDIR)/usr/man/man8
 
 clean:
 	$(RM) *.a *.so *.o *.rpm $(BIN)
diff -Naur xen-2.0/tools/xfrd/Makefile xen-2.0-new/tools/xfrd/Makefile
--- xen-2.0/tools/xfrd/Makefile	2005-02-04 14:38:35.000000000 +0100
+++ xen-2.0-new/tools/xfrd/Makefile	2005-02-19 03:16:06.490372664 +0100
@@ -4,6 +4,9 @@
 # Mike Wray <mike.wray@hp.com>
 #============================================================================
 
+# Default is to install to local 'dist' directory.
+XENDISTDIR ?= ../dist
+XENDESTDIR ?= $(XENDISTDIR)/install
 INSTALL		= install
 INSTALL_PROG	= $(INSTALL) -m0755
 INSTALL_DIR	= $(INSTALL) -d -m0755
@@ -70,9 +73,9 @@
 
 .PHONY: install
 install: xfrd
-	[ -d $(DESTDIR)$(XFRD_INSTALL_DIR) ] || \
-		$(INSTALL_DIR) $(DESTDIR)$(XFRD_INSTALL_DIR)
-	$(INSTALL_PROG) xfrd $(DESTDIR)$(XFRD_INSTALL_DIR)
+	[ -d $(XENDESTDIR)$(XFRD_INSTALL_DIR) ] || \
+		$(INSTALL_DIR) $(XENDESTDIR)$(XFRD_INSTALL_DIR)
+	$(INSTALL_PROG) xfrd $(XENDESTDIR)$(XFRD_INSTALL_DIR)
 
 .PHONY: libutil
 libutil: $(UTIL_LIB)
diff -Naur xen-2.0/xen/Makefile xen-2.0-new/xen/Makefile
--- xen-2.0/xen/Makefile	2005-02-04 14:38:32.000000000 +0100
+++ xen-2.0-new/xen/Makefile	2005-02-19 02:45:45.408219232 +0100
@@ -1,6 +1,6 @@
 # Default is to install to local 'dist' directory.
-DISTDIR ?= ../dist
-DESTDIR ?= $(DISTDIR)/install
+XENDISTDIR ?= ../dist
+XENDESTDIR ?= $(XENDISTDIR)/install
 
 INSTALL			= install
 INSTALL_DATA		= $(INSTALL) -m0644
@@ -28,14 +28,14 @@
 	$(MAKE) install
 
 install: $(TARGET).gz
-	[ -d $(DESTDIR)/boot ] || $(INSTALL_DIR) $(DESTDIR)/boot
-	$(INSTALL_DATA) $(TARGET).gz $(DESTDIR)/boot
-	$(INSTALL_DATA) $(TARGET)-syms $(DESTDIR)/boot
-	[ -d $(DESTDIR)/usr/include/xen/io ] || \
-		$(INSTALL_DIR) $(DESTDIR)/usr/include/xen/io
-	$(INSTALL_DATA) include/public/*.h $(DESTDIR)/usr/include/xen
-	$(INSTALL_DATA) include/public/io/*.h $(DESTDIR)/usr/include/xen/io
-	$(INSTALL_DATA) include/public/COPYING $(DESTDIR)/usr/include/xen
+	[ -d $(XENDESTDIR)/boot ] || $(INSTALL_DIR) $(XENDESTDIR)/boot
+	$(INSTALL_DATA) $(TARGET).gz $(XENDESTDIR)/boot
+	$(INSTALL_DATA) $(TARGET)-syms $(XENDESTDIR)/boot
+	[ -d $(XENDESTDIR)/usr/include/xen/io ] || \
+		$(INSTALL_DIR) $(XENDESTDIR)/usr/include/xen/io
+	$(INSTALL_DATA) include/public/*.h $(XENDESTDIR)/usr/include/xen
+	$(INSTALL_DATA) include/public/io/*.h $(XENDESTDIR)/usr/include/xen/io
+	$(INSTALL_DATA) include/public/COPYING $(XENDESTDIR)/usr/include/xen
 
 clean:
 	$(MAKE) -C tools clean