Index: 2005-12-16/arch/i386/boot-xen/Makefile
===================================================================
--- 2005-12-16.orig/arch/i386/boot-xen/Makefile	2005-12-16 15:38:28.000000000 +0100
+++ 2005-12-16/arch/i386/boot-xen/Makefile	2005-12-16 16:10:45.126760928 +0100
@@ -7,15 +7,18 @@ vmlinuz: vmlinux-stripped FORCE
 vmlinux-stripped: vmlinux FORCE
 	$(call if_changed,objcopy)
 
+ROOT_PATH := $(patsubst %/boot,%,$(INSTALL_PATH))
+USR_PATH  := $(ROOT_PATH)/usr
+
 XINSTALL_NAME ?= $(KERNELRELEASE)
 install: vmlinuz
-	mkdir -p $(INSTALL_PATH)/boot
-	ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_PATH)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
-	rm -f $(INSTALL_PATH)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
-	install -m0644 vmlinuz $(INSTALL_PATH)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
-	install -m0644 vmlinux $(INSTALL_PATH)/boot/vmlinux-syms-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
-	install -m0664 .config $(INSTALL_PATH)/boot/config-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
-	install -m0664 System.map $(INSTALL_PATH)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
-	ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_PATH)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
-	mkdir -p $(INSTALL_PATH)/usr/include/xen/linux
-	install -m0644 $(srctree)/include/xen/public/*.h $(INSTALL_PATH)/usr/include/xen/linux
+	mkdir -p $(INSTALL_PATH)
+	ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_PATH)/vmlinuz-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
+	rm -f $(INSTALL_PATH)/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
+	install -m0644 vmlinuz $(INSTALL_PATH)/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
+	install -m0644 vmlinux $(INSTALL_PATH)/vmlinux-syms-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
+	install -m0664 .config $(INSTALL_PATH)/config-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
+	install -m0664 System.map $(INSTALL_PATH)/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
+	ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_PATH)/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
+	mkdir -p $(USR_PATH)/include/xen/linux
+	install -m0644 $(srctree)/include/xen/public/*.h $(USR_PATH)/usr/include/xen/linux