Mailing List Archive

Merge 2.0-testing change:
ChangeSet 1.1414.1.1, 2005/05/16 13:52:13+01:00, cl349@firebug.cl.cam.ac.uk

Merge 2.0-testing change:
Add time-label to /etc/xen.old directory name.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>



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


diff -Nru a/Makefile b/Makefile
--- a/Makefile 2005-05-16 13:03:44 -04:00
+++ b/Makefile 2005-05-16 13:03:44 -04:00
@@ -20,11 +20,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
@@ -159,7 +160,7 @@
uninstall:
[ -d $(D)/etc/xen ] && mv -f $(D)/etc/xen $(D)/etc/xen.old-$(date +%s)
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*
@@ -168,6 +169,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@lists.xensource.com
http://lists.xensource.com/xen-changelog