# HG changeset patch
# User David Scott <dave.scott@xxxxxxxxxxxxx>
# Date 1273789407 -3600
# Node ID c5f17a73162e266683f7a8c53e88a5dbdd2d1c6c
# Parent  6a5c68b92b8b6e33464aa18986046e4ac1f30160
OMakefiles now respect DESTDIR, for simpler packaging.

Signed-off-by: David Scott <dave.scott@xxxxxxxxxxxxx>

diff -r 6a5c68b92b8b -r c5f17a73162e OMakefile
--- a/OMakefile	Thu May 13 23:23:26 2010 +0100
+++ b/OMakefile	Thu May 13 23:23:27 2010 +0100
@@ -46,11 +46,13 @@
 # For the Zurich chroot environment
 CFLAGS+=-I$(shell ocamlc -where)
 
+DESTDIR=$(getenv DESTDIR, $(ROOT)/dist/staging)
+DEBUGDIST=$(DESTDIR)/opt/xensource/debug
+LIBEXEC=$(DESTDIR)/opt/xensource/libexec
+
 DIST=$(ROOT)/dist
 SDK=$(ROOT)/dist/staging/SDK
 SDKWWW=$(ROOT)/dist/staging/SDKwww
-DEBUGDIST=$(DIST)/staging/opt/xensource/debug
-LIBEXEC=$(DIST)/staging/opt/xensource/libexec
 
 CLEAN_OBJS = *.cmi *.cmo *.cmx *.cma *.cmxa *.annot *.run *.opt *.o *.a
 export CLEAN_OBJS
diff -r 6a5c68b92b8b -r c5f17a73162e ocaml/auth/OMakefile
--- a/ocaml/auth/OMakefile	Thu May 13 23:23:26 2010 +0100
+++ b/ocaml/auth/OMakefile	Thu May 13 23:23:27 2010 +0100
@@ -17,4 +17,4 @@
 
 .PHONY: install
 install:
-	mkdir -p $(DIST)/staging/opt/xensource/bin
\ No newline at end of file
+	mkdir -p $(DESTDIR)/opt/xensource/bin
\ No newline at end of file
diff -r 6a5c68b92b8b -r c5f17a73162e ocaml/cdrommon/OMakefile
--- a/ocaml/cdrommon/OMakefile	Thu May 13 23:23:26 2010 +0100
+++ b/ocaml/cdrommon/OMakefile	Thu May 13 23:23:27 2010 +0100
@@ -4,8 +4,8 @@
 
 .PHONY: install
 install:
-	mkdir -p $(DIST)/staging/opt/xensource/libexec
-	cp -f cdrommon $(DIST)/staging/opt/xensource/libexec
+	mkdir -p $(DESTDIR)/opt/xensource/libexec
+	cp -f cdrommon $(DESTDIR)/opt/xensource/libexec
 
 .PHONY: clean
 clean:
diff -r 6a5c68b92b8b -r c5f17a73162e ocaml/db_process/OMakefile
--- a/ocaml/db_process/OMakefile	Thu May 13 23:23:26 2010 +0100
+++ b/ocaml/db_process/OMakefile	Thu May 13 23:23:27 2010 +0100
@@ -7,8 +7,8 @@
 
 .PHONY: install
 install:
-	mkdir -p $(DIST)/staging/opt/xensource/bin
-	cp -f xapi-db-process $(DIST)/staging/opt/xensource/bin
+	mkdir -p $(DESTDIR)/opt/xensource/bin
+	cp -f xapi-db-process $(DESTDIR)/opt/xensource/bin
 
 .PHONY: sdk-install
 sdk-install: install
diff -r 6a5c68b92b8b -r c5f17a73162e ocaml/guest_installer/OMakefile
--- a/ocaml/guest_installer/OMakefile	Thu May 13 23:23:26 2010 +0100
+++ b/ocaml/guest_installer/OMakefile	Thu May 13 23:23:27 2010 +0100
@@ -11,6 +11,6 @@
 
 #.PHONY: install
 #install:
-#	mkdir -p $(DIST)/staging/opt/xensource/bin
-#	cp xinstall $(DIST)/staging/opt/xensource/bin
+#	mkdir -p $(DESTDIR)/opt/xensource/bin
+#	cp xinstall $(DESTDIR)/opt/xensource/bin
 
diff -r 6a5c68b92b8b -r c5f17a73162e ocaml/license/OMakefile
--- a/ocaml/license/OMakefile	Thu May 13 23:23:26 2010 +0100
+++ b/ocaml/license/OMakefile	Thu May 13 23:23:27 2010 +0100
@@ -21,10 +21,10 @@
 
 .PHONY: install
 install: $(V6D)
-	mkdir -p $(DIST)/staging/opt/xensource/libexec
-	$(IPROG) $(V6D) $(DIST)/staging/opt/xensource/libexec/v6d
-	mkdir -p $(DIST)/staging/opt/xensource/bin
-	$(IPROG) v6d-reopen-logs $(DIST)/staging/opt/xensource/bin
+	mkdir -p $(LIBEXEC)
+	$(IPROG) $(V6D) $(LIBEXEC)/v6d
+	mkdir -p $(DESTDIR)/opt/xensource/bin
+	$(IPROG) v6d-reopen-logs $(DESTDIR)/opt/xensource/bin
 
 .PHONY: sdk-install
 sdk-install: install
diff -r 6a5c68b92b8b -r c5f17a73162e ocaml/lvhdrt/OMakefile
--- a/ocaml/lvhdrt/OMakefile	Thu May 13 23:23:26 2010 +0100
+++ b/ocaml/lvhdrt/OMakefile	Thu May 13 23:23:27 2010 +0100
@@ -15,6 +15,6 @@
 install:
 	mkdir -p $(DEBUGDIST)
 	$(IPROG) lvhdrt $(DEBUGDIST)
-	$(IEXE) lvhdrt-helper $(DIST)/staging/etc/xapi.d/plugins/lvhdrt-helper
-	$(IEXE) lvhdrt-trash-vdi $(DIST)/staging/etc/xapi.d/plugins/lvhdrt-trash-vdi 
+	$(IEXE) lvhdrt-helper $(DESTDIR)/etc/xapi.d/plugins/lvhdrt-helper
+	$(IEXE) lvhdrt-trash-vdi $(DESTDIR)/etc/xapi.d/plugins/lvhdrt-trash-vdi 
 
diff -r 6a5c68b92b8b -r c5f17a73162e ocaml/mpathalert/OMakefile
--- a/ocaml/mpathalert/OMakefile	Thu May 13 23:23:26 2010 +0100
+++ b/ocaml/mpathalert/OMakefile	Thu May 13 23:23:27 2010 +0100
@@ -11,6 +11,6 @@
 
 .PHONY: install
 install:
-	mkdir -p $(DIST)/staging/opt/xensource/bin
-	$(IPROG) mpathalert $(DIST)/staging/opt/xensource/bin
+	mkdir -p $(DESTDIR)/opt/xensource/bin
+	$(IPROG) mpathalert $(DESTDIR)/opt/xensource/bin
 
diff -r 6a5c68b92b8b -r c5f17a73162e ocaml/multipathrt/OMakefile
--- a/ocaml/multipathrt/OMakefile	Thu May 13 23:23:26 2010 +0100
+++ b/ocaml/multipathrt/OMakefile	Thu May 13 23:23:27 2010 +0100
@@ -19,5 +19,5 @@
 install:
 	mkdir -p $(DEBUGDIST)
 	$(IPROG) multipathrt $(DEBUGDIST)
-	mkdir -p $(DIST)/staging/etc/xapi.d/plugins
-	$(IEXE) multipathrt-helper $(DIST)/staging/etc/xapi.d/plugins/multipathrt-helper
+	mkdir -p $(DESTDIR)/etc/xapi.d/plugins
+	$(IEXE) multipathrt-helper $(DESTDIR)/etc/xapi.d/plugins/multipathrt-helper
diff -r 6a5c68b92b8b -r c5f17a73162e ocaml/xapi/OMakefile
--- a/ocaml/xapi/OMakefile	Thu May 13 23:23:26 2010 +0100
+++ b/ocaml/xapi/OMakefile	Thu May 13 23:23:27 2010 +0100
@@ -247,8 +247,8 @@
 
 .PHONY: install
 install:
-	mkdir -p $(DIST)/staging/opt/xensource/bin
-	cp -f xapi $(DIST)/staging/opt/xensource/bin
+	mkdir -p $(DESTDIR)/opt/xensource/bin
+	cp -f xapi $(DESTDIR)/opt/xensource/bin
 	mkdir -p $(DEBUGDIST)
 	$(IPROG) quicktest $(DEBUGDIST)
 	cp -f quicktestbin $(DEBUGDIST)
@@ -256,8 +256,8 @@
 
 .PHONY: sdk-install
 sdk-install: install
-	mkdir -p $(DIST)/staging/opt/xensource/libexec
-	cp fakeguestagent $(DIST)/staging/opt/xensource/libexec/
+	mkdir -p $(DESTDIR)/opt/xensource/libexec
+	cp fakeguestagent $(DESTDIR)/opt/xensource/libexec/
 
 .PHONY: clean
 clean:
diff -r 6a5c68b92b8b -r c5f17a73162e ocaml/xe-cli/OMakefile
--- a/ocaml/xe-cli/OMakefile	Thu May 13 23:23:26 2010 +0100
+++ b/ocaml/xe-cli/OMakefile	Thu May 13 23:23:27 2010 +0100
@@ -95,12 +95,12 @@
 
 .PHONY: install
 install:
-	mkdir -p $(DIST)/staging/opt/xensource/bin
-	$(IPROG) xe $(DIST)/staging/opt/xensource/bin
-	mkdir -p $(DIST)/staging/usr/bin
-	ln -sf /opt/xensource/bin/xe $(DIST)/staging/usr/bin/xe
-	mkdir -p $(DIST)/staging/etc/bash_completion.d
-	$(IPROG) bash-completion $(DIST)/staging/etc/bash_completion.d/cli
+	mkdir -p $(DESTDIR)/opt/xensource/bin
+	$(IPROG) xe $(DESTDIR)/opt/xensource/bin
+	mkdir -p $(DESTDIR)/usr/bin
+	ln -sf /opt/xensource/bin/xe $(DESTDIR)/usr/bin/xe
+	mkdir -p $(DESTDIR)/etc/bash_completion.d
+	$(IPROG) bash-completion $(DESTDIR)/etc/bash_completion.d/cli
 	mkdir -p $(DEBUGDIST)
 
 .PHONY: sdk-install
diff -r 6a5c68b92b8b -r c5f17a73162e ocaml/xe-cli/rt/OMakefile
--- a/ocaml/xe-cli/rt/OMakefile	Thu May 13 23:23:26 2010 +0100
+++ b/ocaml/xe-cli/rt/OMakefile	Thu May 13 23:23:27 2010 +0100
@@ -30,5 +30,5 @@
 	mkdir -p /tmp/cli-rt-domu/root
 	cp gtmessages.ml gtcomms.ml gtlinuxops.ml gtserver_linux.ml /tmp/cli-rt-domu/root
 	(cd $(ROOT)/scripts; /bin/sh ./make-patch /tmp/cli-rt-domu /tmp/cli-rt-domu-shar.sh)
-	mv /tmp/cli-rt-domu-shar.sh $(DIST)/staging/opt/xensource/debug
-	install -m 755 -o root -g root install-debian-pv.sh install-debian-pv-inside.sh $(DIST)/staging/opt/xensource/debug
+	mv /tmp/cli-rt-domu-shar.sh $(DESTDIR)/opt/xensource/debug
+	install -m 755 -o root -g root install-debian-pv.sh install-debian-pv-inside.sh $(DESTDIR)/opt/xensource/debug
diff -r 6a5c68b92b8b -r c5f17a73162e ocaml/xenops/OMakefile
--- a/ocaml/xenops/OMakefile	Thu May 13 23:23:26 2010 +0100
+++ b/ocaml/xenops/OMakefile	Thu May 13 23:23:27 2010 +0100
@@ -64,11 +64,11 @@
 	mkdir -p $(DEBUGDIST)
 	cp -f $(DEBUG_PROGS) $(DEBUGDIST)
 	sh -c 'for i in $(SYMLINK_PROGS); do ln -nfs xenops $(DEBUGDIST)/$$i; done'
-	mkdir -p $(DIST)/staging/opt/xensource/bin
-	$(IPROG) $(BIN_PROGS) $(DIST)/staging/opt/xensource/bin
-	mkdir -p $(DIST)/staging/opt/xensource/libexec
-	$(IPROG) fence $(DIST)/staging/opt/xensource/libexec/fence.bin
-	$(IPROG) squeezed $(DIST)/staging/opt/xensource/libexec/squeezed
+	mkdir -p $(DESTDIR)/opt/xensource/bin
+	$(IPROG) $(BIN_PROGS) $(DESTDIR)/opt/xensource/bin
+	mkdir -p $(DESTDIR)/opt/xensource/libexec
+	$(IPROG) fence $(DESTDIR)/opt/xensource/libexec/fence.bin
+	$(IPROG) squeezed $(DESTDIR)/opt/xensource/libexec/squeezed
 
 .PHONY: sdk-install
 sdk-install: install
diff -r 6a5c68b92b8b -r c5f17a73162e ocaml/xenstored/OMakefile
--- a/ocaml/xenstored/OMakefile	Thu May 13 23:23:26 2010 +0100
+++ b/ocaml/xenstored/OMakefile	Thu May 13 23:23:27 2010 +0100
@@ -18,10 +18,10 @@
 
 .PHONY: install
 install:
-	mkdir -p $(DIST)/staging/opt/xensource/bin
-	cp xenstored $(DIST)/staging/opt/xensource/bin
-	mkdir -p $(DIST)/staging/etc/xensource
-	cp xenstored.conf $(DIST)/staging/etc/xensource
+	mkdir -p $(DESTDIR)/opt/xensource/bin
+	cp xenstored $(DESTDIR)/opt/xensource/bin
+	mkdir -p $(DESTDIR)/etc/xensource
+	cp xenstored.conf $(DESTDIR)/etc/xensource
 
 .PHONY: sdk-install
 sdk-install: install
diff -r 6a5c68b92b8b -r c5f17a73162e ocaml/xiu/OMakefile
--- a/ocaml/xiu/OMakefile	Thu May 13 23:23:26 2010 +0100
+++ b/ocaml/xiu/OMakefile	Thu May 13 23:23:27 2010 +0100
@@ -10,10 +10,10 @@
 
 .PHONY: install
 install:
-	mkdir -p $(DIST)/staging/opt/xensource/libexec
-	$(IPROG) xiu $(DIST)/staging/opt/xensource/libexec/
+	mkdir -p $(DESTDIR)/opt/xensource/libexec
+	$(IPROG) xiu $(DESTDIR)/opt/xensource/libexec/
 
 .PHONY: sdk-install
 sdk-install:
-	mkdir -p $(DIST)/staging/opt/xensource/libexec
-	$(IPROG) xiu $(DIST)/staging/opt/xensource/libexec/
+	mkdir -p $(DESTDIR)/opt/xensource/libexec
+	$(IPROG) xiu $(DESTDIR)/opt/xensource/libexec/
diff -r 6a5c68b92b8b -r c5f17a73162e ocaml/xsh/OMakefile
--- a/ocaml/xsh/OMakefile	Thu May 13 23:23:26 2010 +0100
+++ b/ocaml/xsh/OMakefile	Thu May 13 23:23:27 2010 +0100
@@ -10,8 +10,8 @@
 
 .PHONY: install
 install:
-	mkdir -p $(DIST)/staging/opt/xensource/bin
-	cp -f xsh $(DIST)/staging/opt/xensource/bin
+	mkdir -p $(DESTDIR)/opt/xensource/bin
+	cp -f xsh $(DESTDIR)/opt/xensource/bin
 
 clean:
 	rm -f *.cmi *.cmx *.cmo *.a *.cma *.cmxa *.run *.opt *.annot *.o
diff -r 6a5c68b92b8b -r c5f17a73162e scripts/OMakefile
--- a/scripts/OMakefile	Thu May 13 23:23:26 2010 +0100
+++ b/scripts/OMakefile	Thu May 13 23:23:27 2010 +0100
@@ -2,71 +2,71 @@
 
 .PHONY: install
 install:
-	mkdir -p $(DIST)/staging/opt/xensource/bin
-	mkdir -p $(DIST)/staging/var/patch
-	mkdir -p $(DIST)/staging/var/patch/applied
-	mkdir -p $(DIST)/staging/var/xapi
-	mkdir -p $(DIST)/staging/etc/xensource
-	mkdir -p $(DIST)/staging/etc/logrotate.d
-	mkdir -p $(DIST)/staging/etc/xensource/master.d
+	mkdir -p $(DESTDIR)/opt/xensource/bin
+	mkdir -p $(DESTDIR)/var/patch
+	mkdir -p $(DESTDIR)/var/patch/applied
+	mkdir -p $(DESTDIR)/var/xapi
+	mkdir -p $(DESTDIR)/etc/xensource
+	mkdir -p $(DESTDIR)/etc/logrotate.d
+	mkdir -p $(DESTDIR)/etc/xensource/master.d
 	mkdir -p $(LIBEXEC)
-	$(IPROG) fence $(DIST)/staging/opt/xensource/libexec	
-	$(IPROG) xha-lc $(DIST)/staging/opt/xensource/libexec
-	$(IPROG) xapi-health-check $(DIST)/staging/opt/xensource/libexec
-	$(IPROG) license-check.py $(DIST)/staging/opt/xensource/libexec
-	$(IPROG) mail-alarm $(DIST)/staging/opt/xensource/libexec
-	$(IPROG) audit-logrotate $(DIST)/staging/etc/logrotate.d/audit
-	$(IPROG) xapi-logrotate $(DIST)/staging/etc/logrotate.d/xapi
-	$(IPROG) xapi-wait-init-complete $(DIST)/staging/opt/xensource/bin/
-	$(IPROG) xapi-autostart-vms $(DIST)/staging/opt/xensource/bin/
-	$(IPROG) udhcpd.skel $(DIST)/staging/var/xapi/udhcpd.skel
-	$(IPROG) xapi-ssl.conf $(DIST)/staging/etc/xensource/xapi-ssl.conf
-	$(IPROG) xapi.conf $(DIST)/staging/etc/xensource/xapi.conf
-	$(IPROG) log.conf $(DIST)/staging/etc/xensource/log.conf
-	$(IPROG) db.conf.skel $(DIST)/staging/etc/xensource/db.conf
-	$(IPROG) rio.db.conf.skel $(DIST)/staging/etc/xensource/db.conf.rio
-	mkdir -p $(DIST)/staging/etc/rc.d/init.d
-	$(IPROG) init.d-xenservices $(DIST)/staging/etc/rc.d/init.d/xenservices
-	$(IPROG) init.d-xapi $(DIST)/staging/etc/rc.d/init.d/xapi
-	$(IPROG) init.d-xapissl $(DIST)/staging/etc/rc.d/init.d/xapissl
-	$(IPROG) init.d-xapi-domains $(DIST)/staging/etc/rc.d/init.d/xapi-domains
-	$(IPROG) init.d-squeezed $(DIST)/staging/etc/rc.d/init.d/squeezed
-	$(IPROG) init.d-management-interface $(DIST)/staging/etc/rc.d/init.d/management-interface
-	$(IDATA) squeezed-logrotate $(DIST)/staging/etc/logrotate.d/squeezed
-	$(IPROG) init.d-v6d $(DIST)/staging/etc/rc.d/init.d/v6d
-	$(IDATA) v6d-logrotate $(DIST)/staging/etc/logrotate.d/v6d
-	mkdir -p $(DIST)/staging/etc/xensource/master.d
-	$(IPROG) on-master-start $(DIST)/staging/etc/xensource/master.d/01-example
-	$(IPROG) mpathalert-daemon $(DIST)/staging/etc/xensource/master.d/03-mpathalert-daemon
-	mkdir -p $(DIST)/staging/etc/sysconfig
-	$(IPROG) sysconfig-xapi $(DIST)/staging/etc/sysconfig/xapi
-	mkdir -p $(DIST)/staging/etc/udev
-	$(IPROG) xen-backend.rules $(DIST)/staging/etc/udev/
-	$(IPROG) xen-frontend.rules $(DIST)/staging/etc/udev/
+	$(IPROG) fence $(DESTDIR)/opt/xensource/libexec	
+	$(IPROG) xha-lc $(DESTDIR)/opt/xensource/libexec
+	$(IPROG) xapi-health-check $(DESTDIR)/opt/xensource/libexec
+	$(IPROG) license-check.py $(DESTDIR)/opt/xensource/libexec
+	$(IPROG) mail-alarm $(DESTDIR)/opt/xensource/libexec
+	$(IPROG) audit-logrotate $(DESTDIR)/etc/logrotate.d/audit
+	$(IPROG) xapi-logrotate $(DESTDIR)/etc/logrotate.d/xapi
+	$(IPROG) xapi-wait-init-complete $(DESTDIR)/opt/xensource/bin/
+	$(IPROG) xapi-autostart-vms $(DESTDIR)/opt/xensource/bin/
+	$(IPROG) udhcpd.skel $(DESTDIR)/var/xapi/udhcpd.skel
+	$(IPROG) xapi-ssl.conf $(DESTDIR)/etc/xensource/xapi-ssl.conf
+	$(IPROG) xapi.conf $(DESTDIR)/etc/xensource/xapi.conf
+	$(IPROG) log.conf $(DESTDIR)/etc/xensource/log.conf
+	$(IPROG) db.conf.skel $(DESTDIR)/etc/xensource/db.conf
+	$(IPROG) rio.db.conf.skel $(DESTDIR)/etc/xensource/db.conf.rio
+	mkdir -p $(DESTDIR)/etc/rc.d/init.d
+	$(IPROG) init.d-xenservices $(DESTDIR)/etc/rc.d/init.d/xenservices
+	$(IPROG) init.d-xapi $(DESTDIR)/etc/rc.d/init.d/xapi
+	$(IPROG) init.d-xapissl $(DESTDIR)/etc/rc.d/init.d/xapissl
+	$(IPROG) init.d-xapi-domains $(DESTDIR)/etc/rc.d/init.d/xapi-domains
+	$(IPROG) init.d-squeezed $(DESTDIR)/etc/rc.d/init.d/squeezed
+	$(IPROG) init.d-management-interface $(DESTDIR)/etc/rc.d/init.d/management-interface
+	$(IDATA) squeezed-logrotate $(DESTDIR)/etc/logrotate.d/squeezed
+	$(IPROG) init.d-v6d $(DESTDIR)/etc/rc.d/init.d/v6d
+	$(IDATA) v6d-logrotate $(DESTDIR)/etc/logrotate.d/v6d
+	mkdir -p $(DESTDIR)/etc/xensource/master.d
+	$(IPROG) on-master-start $(DESTDIR)/etc/xensource/master.d/01-example
+	$(IPROG) mpathalert-daemon $(DESTDIR)/etc/xensource/master.d/03-mpathalert-daemon
+	mkdir -p $(DESTDIR)/etc/sysconfig
+	$(IPROG) sysconfig-xapi $(DESTDIR)/etc/sysconfig/xapi
+	mkdir -p $(DESTDIR)/etc/udev
+	$(IPROG) xen-backend.rules $(DESTDIR)/etc/udev/
+	$(IPROG) xen-frontend.rules $(DESTDIR)/etc/udev/
 	$(IPROG) generate_ssl_cert $(LIBEXEC)/
-	$(IPROG) fix_firewall.sh $(DIST)/staging/opt/xensource/bin/
-	mkdir -p $(DIST)/staging/opt/xensource/debug
-	$(IPROG) debug_ha_query_liveset $(DIST)/staging/opt/xensource/debug
-	$(IPROG) xe-scsi-dev-map $(DIST)/staging/opt/xensource/bin/
-	$(IPROG) xe-mount-iso-sr $(DIST)/staging/opt/xensource/bin/
-	$(IPROG) xe-set-iscsi-iqn $(DIST)/staging/opt/xensource/bin/
-	$(IPROG) xe-toolstack-restart $(DIST)/staging/opt/xensource/bin/
-	$(IPROG) xe-xentrace $(DIST)/staging/opt/xensource/bin/
-	$(IPROG) xe-edit-bootloader $(DIST)/staging/opt/xensource/bin/
-	$(IPROG) static-vdis $(DIST)/staging/opt/xensource/bin/
-	$(IPROG) with-vdi $(DIST)/staging/opt/xensource/debug
-	mkdir -p $(DIST)/staging/etc/udev/rules.d
+	$(IPROG) fix_firewall.sh $(DESTDIR)/opt/xensource/bin/
+	mkdir -p $(DESTDIR)/opt/xensource/debug
+	$(IPROG) debug_ha_query_liveset $(DESTDIR)/opt/xensource/debug
+	$(IPROG) xe-scsi-dev-map $(DESTDIR)/opt/xensource/bin/
+	$(IPROG) xe-mount-iso-sr $(DESTDIR)/opt/xensource/bin/
+	$(IPROG) xe-set-iscsi-iqn $(DESTDIR)/opt/xensource/bin/
+	$(IPROG) xe-toolstack-restart $(DESTDIR)/opt/xensource/bin/
+	$(IPROG) xe-xentrace $(DESTDIR)/opt/xensource/bin/
+	$(IPROG) xe-edit-bootloader $(DESTDIR)/opt/xensource/bin/
+	$(IPROG) static-vdis $(DESTDIR)/opt/xensource/bin/
+	$(IPROG) with-vdi $(DESTDIR)/opt/xensource/debug
+	mkdir -p $(DESTDIR)/etc/udev/rules.d
 	sh -c \
-	'cd $(DIST)/staging/etc/udev/rules.d; \
+	'cd $(DESTDIR)/etc/udev/rules.d; \
 	ln -sf ../xen-backend.rules; \
 	ln -sf ../xen-frontend.rules'
-	mkdir -p $(DIST)/staging/etc/xensource/scripts/
-	$(IPROG) block block-frontend vif tap $(DIST)/staging/etc/xensource/scripts/
-	$(IPROG) pool.conf $(DIST)/staging/etc/xensource/
-	mkdir -p $(DIST)/staging/etc/pam.d
-	$(IPROG) pam.d-xapi $(DIST)/staging/etc/pam.d/xapi
+	mkdir -p $(DESTDIR)/etc/xensource/scripts/
+	$(IPROG) block block-frontend vif tap $(DESTDIR)/etc/xensource/scripts/
+	$(IPROG) pool.conf $(DESTDIR)/etc/xensource/
+	mkdir -p $(DESTDIR)/etc/pam.d
+	$(IPROG) pam.d-xapi $(DESTDIR)/etc/pam.d/xapi
 	$(IPROG) qemu-dm-wrapper vncterm-wrapper upload-wrapper logs-download $(LIBEXEC)/
-	mkdir -p $(DIST)/staging/opt/xensource/packages/iso #omg XXX
+	mkdir -p $(DESTDIR)/opt/xensource/packages/iso #omg XXX
 	$(IPROG) interface-reconfigure $(LIBEXEC)
 	$(IPROG) InterfaceReconfigure.py $(LIBEXEC)
 	$(IPROG) InterfaceReconfigureBridge.py $(LIBEXEC)
@@ -78,8 +78,8 @@
 	$(IPROG) set-hostname $(LIBEXEC)
 	$(IPROG) update-mh-info $(LIBEXEC)
 	$(IPROG) host-bugreport-upload $(LIBEXEC)/host-bugreport-upload
-	$(IPROG) xe-backup-metadata $(DIST)/staging/opt/xensource/bin/
-	$(IPROG) xe-restore-metadata $(DIST)/staging/opt/xensource/bin/
+	$(IPROG) xe-backup-metadata $(DESTDIR)/opt/xensource/bin/
+	$(IPROG) xe-restore-metadata $(DESTDIR)/opt/xensource/bin/
 	$(IPROG) link-vms-by-sr.py $(LIBEXEC)
 	$(IPROG) print-custom-templates $(LIBEXEC)
 	$(IPROG) backup-sr-metadata.py $(LIBEXEC)
@@ -88,22 +88,22 @@
 	$(IPROG) backup-metadata-cron $(LIBEXEC)
 	$(IPROG) c_rehash $(LIBEXEC)
 	$(IPROG) lw-force-domain-leave $(LIBEXEC)
-	$(IPROG) init.d-perfmon $(DIST)/staging/etc/rc.d/init.d/perfmon
-	mkdir -p $(DIST)/staging/etc/sysconfig
-	$(IPROG) sysconfig-perfmon $(DIST)/staging/etc/sysconfig/perfmon
-	$(IPROG) perfmon $(DIST)/staging/opt/xensource/bin/
-	mkdir -p $(DIST)/staging/etc/xapi.d/plugins
-	$(IPROG) plugins/perfmon $(DIST)/staging/etc/xapi.d/plugins/
-	$(IPROG) plugins/extauth-hook $(DIST)/staging/etc/xapi.d/plugins/
-	$(IPROG) plugins/extauth-hook-AD.py $(DIST)/staging/etc/xapi.d/plugins/
+	$(IPROG) init.d-perfmon $(DESTDIR)/etc/rc.d/init.d/perfmon
+	mkdir -p $(DESTDIR)/etc/sysconfig
+	$(IPROG) sysconfig-perfmon $(DESTDIR)/etc/sysconfig/perfmon
+	$(IPROG) perfmon $(DESTDIR)/opt/xensource/bin/
+	mkdir -p $(DESTDIR)/etc/xapi.d/plugins
+	$(IPROG) plugins/perfmon $(DESTDIR)/etc/xapi.d/plugins/
+	$(IPROG) plugins/extauth-hook $(DESTDIR)/etc/xapi.d/plugins/
+	$(IPROG) plugins/extauth-hook-AD.py $(DESTDIR)/etc/xapi.d/plugins/
 	$(IPROG) set-dom0-memory-target-from-packs $(LIBEXEC)
 
 .PHONY: sdk-install
 sdk-install: install
 	cp motd $(SDK)/motd
-	$(IPROG) init.d-sdkinit $(DIST)/staging/etc/rc.d/init.d/sdkinit
-	mkdir -p $(DIST)/staging/usr/lib/python2.4/site-packages/xen/lowlevel
-	touch $(DIST)/staging/usr/lib/python2.4/site-packages/xen/__init__.py
-	touch $(DIST)/staging/usr/lib/python2.4/site-packages/xen/lowlevel/__init__.py
-	cp xc.py $(DIST)/staging/usr/lib/python2.4/site-packages/xen/lowlevel
+	$(IPROG) init.d-sdkinit $(DESTDIR)/etc/rc.d/init.d/sdkinit
+	mkdir -p $(DESTDIR)/usr/lib/python2.4/site-packages/xen/lowlevel
+	touch $(DESTDIR)/usr/lib/python2.4/site-packages/xen/__init__.py
+	touch $(DESTDIR)/usr/lib/python2.4/site-packages/xen/lowlevel/__init__.py
+	cp xc.py $(DESTDIR)/usr/lib/python2.4/site-packages/xen/lowlevel
 
diff -r 6a5c68b92b8b -r c5f17a73162e scripts/examples/python/OMakefile
--- a/scripts/examples/python/OMakefile	Thu May 13 23:23:26 2010 +0100
+++ b/scripts/examples/python/OMakefile	Thu May 13 23:23:27 2010 +0100
@@ -35,16 +35,16 @@
 
 .PHONY: install
 install:
-	mkdir -p $(DIST)/staging/opt/xensource/libexec
-	mkdir -p $(DIST)/staging/usr/lib/$(PYTHON_DIR)/site-packages
-	mkdir -p $(DIST)/staging/etc/xapi.d/plugins
-	$(IDATA) XenAPIPlugin.py XenAPI.py inventory.py $(DIST)/staging/usr/lib/$(PYTHON_DIR)/site-packages/
-	$(IEXE) echo.py $(DIST)/staging/etc/xapi.d/plugins/echo
-	$(IEXE) wake-on-lan.py $(DIST)/staging/etc/xapi.d/plugins/wake-on-lan
-	$(IEXE) shutdown.py $(DIST)/staging/opt/xensource/libexec/shutdown
-	$(IEXE) shell.py $(DIST)/staging/opt/xensource/libexec/shell.py
+	mkdir -p $(DESTDIR)/opt/xensource/libexec
+	mkdir -p $(DESTDIR)/usr/lib/$(PYTHON_DIR)/site-packages
+	mkdir -p $(DESTDIR)/etc/xapi.d/plugins
+	$(IDATA) XenAPIPlugin.py XenAPI.py inventory.py $(DESTDIR)/usr/lib/$(PYTHON_DIR)/site-packages/
+	$(IEXE) echo.py $(DESTDIR)/etc/xapi.d/plugins/echo
+	$(IEXE) wake-on-lan.py $(DESTDIR)/etc/xapi.d/plugins/wake-on-lan
+	$(IEXE) shutdown.py $(DESTDIR)/opt/xensource/libexec/shutdown
+	$(IEXE) shell.py $(DESTDIR)/opt/xensource/libexec/shell.py
 
 .PHONY: sdk-install
 sdk-install:
-	mkdir -p $(DIST)/staging/usr/lib/$(PYTHON_DIR)/site-packages
-	$(IDATA) XenAPIPlugin.py XenAPI.py inventory.py $(DIST)/staging/usr/lib/$(PYTHON_DIR)/site-packages/
+	mkdir -p $(DESTDIR)/usr/lib/$(PYTHON_DIR)/site-packages
+	$(IDATA) XenAPIPlugin.py XenAPI.py inventory.py $(DESTDIR)/usr/lib/$(PYTHON_DIR)/site-packages/
diff -r 6a5c68b92b8b -r c5f17a73162e scripts/poweron/OMakefile
--- a/scripts/poweron/OMakefile	Thu May 13 23:23:26 2010 +0100
+++ b/scripts/poweron/OMakefile	Thu May 13 23:23:27 2010 +0100
@@ -1,8 +1,8 @@
 .PHONY: install
 install:
-             mkdir -p $(DIST)/staging/etc/xapi.d/plugins
-             $(IPROG) wlan.py $(DIST)/staging/etc/xapi.d/plugins/wlan.py
-             $(IPROG) iLOPowerON.xml $(DIST)/staging/etc/xapi.d/plugins/iLOPowerON.xml
-             $(IPROG) iLO.py $(DIST)/staging/etc/xapi.d/plugins/iLO.py
-             $(IPROG) DRAC.py $(DIST)/staging/etc/xapi.d/plugins/DRAC.py
-             $(IPROG) power-on.py $(DIST)/staging/etc/xapi.d/plugins/power-on-host
+             mkdir -p $(DESTDIR)/etc/xapi.d/plugins
+             $(IPROG) wlan.py $(DESTDIR)/etc/xapi.d/plugins/wlan.py
+             $(IPROG) iLOPowerON.xml $(DESTDIR)/etc/xapi.d/plugins/iLOPowerON.xml
+             $(IPROG) iLO.py $(DESTDIR)/etc/xapi.d/plugins/iLO.py
+             $(IPROG) DRAC.py $(DESTDIR)/etc/xapi.d/plugins/DRAC.py
+             $(IPROG) power-on.py $(DESTDIR)/etc/xapi.d/plugins/power-on-host
diff -r 6a5c68b92b8b -r c5f17a73162e scripts/templates/OMakefile
--- a/scripts/templates/OMakefile	Thu May 13 23:23:26 2010 +0100
+++ b/scripts/templates/OMakefile	Thu May 13 23:23:27 2010 +0100
@@ -1,7 +1,7 @@
 .PHONY: install
 install:
-	mkdir -p $(DIST)/staging/opt/xensource/packages/post-install-scripts
-	$(IPROG) debug $(DIST)/staging/opt/xensource/packages/post-install-scripts
-	$(IPROG) debian $(DIST)/staging/opt/xensource/packages/post-install-scripts/debian-etch
-#	ln -f $(DIST)/staging/opt/xensource/packages/post-install-scripts/debian-etch
-#	      $(DIST)/staging/opt/xensource/packages/post-install-scripts/debian-sarge
+	mkdir -p $(DESTDIR)/opt/xensource/packages/post-install-scripts
+	$(IPROG) debug $(DESTDIR)/opt/xensource/packages/post-install-scripts
+	$(IPROG) debian $(DESTDIR)/opt/xensource/packages/post-install-scripts/debian-etch
+#	ln -f $(DESTDIR)/opt/xensource/packages/post-install-scripts/debian-etch
+#	      $(DESTDIR)/opt/xensource/packages/post-install-scripts/debian-sarge