# HG changeset patch
# User smh22@firebug.cl.cam.ac.uk
# Date 1116012475 0
# Node ID 85b71d470051a2752bbb43a9ecfd2197f3b02172
# Parent  650b80c41719488cd3d7e3599612caf527293eaf# Parent  cacce4066cfc0a62c26c20a50092bf54c8fa0c08
bitkeeper revision 1.1406 (4284ffbbTZMaJCmCfmRMF-vfYquQ9w)

Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/smh22/mwray-xend2.bk


diff -r 650b80c41719 -r 85b71d470051 Makefile
--- a/Makefile	Fri May 13 18:28:59 2005 +0000
+++ b/Makefile	Fri May 13 19:27:55 2005 +0000
@@ -158,7 +158,8 @@ help:
 uninstall: DESTDIR=
 uninstall: D=$(DESTDIR)
 uninstall:
-	[ ! -d $(D)/etc/xen ] || mv -f $(D)/etc/xen $(D)/etc/xen.old
+	[ ! -d $(D)/etc/xen.old ] || mv -f $(D)/etc/xen $(D)/etc/xen.old
+	rm -rf $(D)/etc/xen
 	rm -rf $(D)/etc/init.d/xend*
 	rm -rf $(D)/usr/$(LIBDIR)/libxc* $(D)/usr/$(LIBDIR)/libxutil*
 	rm -rf $(D)/usr/lib/python/xen $(D)/usr/include/xen