[Xen-changelog] Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1377, 2005/04/23 17:01:19+01:00, kaf24@xxxxxxxxxxxxxxxxxxxx

        Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
        into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk



 Makefile |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)


diff -Nru a/Makefile b/Makefile
--- a/Makefile  2005-04-23 13:03:47 -04:00
+++ b/Makefile  2005-04-23 13:03:47 -04:00
@@ -22,11 +22,12 @@
 export DESTDIR
 
 # Export target architecture overrides to Xen and Linux sub-trees.
-ifneq ($(TARGET_ARCH),)
-SUBARCH := $(subst x86_32,i386,$(TARGET_ARCH))
-export TARGET_ARCH SUBARCH
+ifneq ($(XEN_TARGET_ARCH),)
+SUBARCH := $(subst x86_32,i386,$(XEN_TARGET_ARCH))
+export XEN_TARGET_ARCH SUBARCH
 endif
 
+include Config.mk
 include buildconfigs/Rules.mk
 
 .PHONY:        all dist install xen tools kernels docs world clean mkpatches 
mrproper
@@ -161,7 +162,7 @@
 uninstall:
        [ ! -d $(D)/etc/xen ] || mv -f $(D)/etc/xen $(D)/etc/xen.old
        rm -rf $(D)/etc/init.d/xend*
-       rm -rf $(D)/usr/lib/libxc* $(D)/usr/lib/libxutil*
+       rm -rf $(D)/usr/$(LIBDIR)/libxc* $(D)/usr/$(LIBDIR)/libxutil*
        rm -rf $(D)/usr/lib/python/xen $(D)/usr/include/xen
        rm -rf $(D)/usr/include/xcs_proto.h $(D)/usr/include/xc.h
        rm -rf $(D)/usr/sbin/xcs $(D)/usr/sbin/xcsdump $(D)/usr/sbin/xen*
@@ -170,6 +171,7 @@
        rm -rf $(D)/usr/share/doc/xen  $(D)/usr/man/man*/xentrace*
        rm -rf $(D)/usr/bin/xen* $(D)/usr/bin/miniterm
        rm -rf $(D)/boot/*xen*
+       rm -rf $(D)/lib/modules/*xen*
 
 # Legacy targets for compatibility
 linux24:

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog