1.1 --- a/tools/Makefile	Thu Feb 04 08:53:49 2010 +0000
     1.2 +++ b/tools/Makefile	Thu Feb 04 09:03:42 2010 +0000
     1.3 @@ -1,4 +1,4 @@
     1.4 -XEN_ROOT = ../
     1.5 +XEN_ROOT = ..
     1.6  include $(XEN_ROOT)/tools/Rules.mk
     1.7  
     1.8  SUBDIRS-y :=

     2.1 --- a/tools/blktap2/drivers/Makefile	Thu Feb 04 08:53:49 2010 +0000
     2.2 +++ b/tools/blktap2/drivers/Makefile	Thu Feb 04 09:03:42 2010 +0000
     2.3 @@ -1,4 +1,4 @@
     2.4 -XEN_ROOT=../../../
     2.5 +XEN_ROOT=../../..
     2.6  BLKTAP_ROOT= ..
     2.7  include $(XEN_ROOT)/tools/Rules.mk
     2.8  

     3.1 --- a/tools/blktap2/include/Makefile	Thu Feb 04 08:53:49 2010 +0000
     3.2 +++ b/tools/blktap2/include/Makefile	Thu Feb 04 09:03:42 2010 +0000
     3.3 @@ -1,4 +1,4 @@
     3.4 -XEN_ROOT := ../../../
     3.5 +XEN_ROOT := ../../..
     3.6  include $(XEN_ROOT)/tools/Rules.mk
     3.7  
     3.8  .PHONY: all

     4.1 --- a/tools/blktap2/lvm/Makefile	Thu Feb 04 08:53:49 2010 +0000
     4.2 +++ b/tools/blktap2/lvm/Makefile	Thu Feb 04 09:03:42 2010 +0000
     4.3 @@ -1,5 +1,5 @@
     4.4 -XEN_ROOT = ../../../
     4.5 -BLKTAP_ROOT := ../
     4.6 +XEN_ROOT = ../../..
     4.7 +BLKTAP_ROOT := ..
     4.8  include $(XEN_ROOT)/tools/Rules.mk
     4.9  
    4.10  ifeq ($(LVM_UTIL_TEST),y)

     5.1 --- a/tools/blktap2/vhd/Makefile	Thu Feb 04 08:53:49 2010 +0000
     5.2 +++ b/tools/blktap2/vhd/Makefile	Thu Feb 04 09:03:42 2010 +0000
     5.3 @@ -1,5 +1,5 @@
     5.4 -XEN_ROOT=../../../
     5.5 -BLKTAP_ROOT := ../
     5.6 +XEN_ROOT=../../..
     5.7 +BLKTAP_ROOT := ..
     5.8  include $(XEN_ROOT)/tools/Rules.mk
     5.9  
    5.10  SUBDIRS-y         :=

     6.1 --- a/tools/blktap2/vhd/lib/Makefile	Thu Feb 04 08:53:49 2010 +0000
     6.2 +++ b/tools/blktap2/vhd/lib/Makefile	Thu Feb 04 09:03:42 2010 +0000
     6.3 @@ -1,12 +1,12 @@
     6.4 -XEN_ROOT=../../../../
     6.5 -BLKTAP_ROOT := ../../
     6.6 +XEN_ROOT=../../../..
     6.7 +BLKTAP_ROOT := ../..
     6.8  include $(XEN_ROOT)/tools/Rules.mk
     6.9  
    6.10  LIBVHD-MAJOR     = 1.0
    6.11  LIBVHD-MINOR     = 0
    6.12  LIBVHD-SONAME    = libvhd.so.$(LIBVHD-MAJOR)
    6.13  
    6.14 -LVM-UTIL-OBJ    := $(BLKTAP_ROOT)lvm/lvm-util.o
    6.15 +LVM-UTIL-OBJ    := $(BLKTAP_ROOT)/lvm/lvm-util.o
    6.16  
    6.17  LIBVHD-BUILD    := libvhd.a
    6.18  

     7.1 --- a/tools/examples/Makefile	Thu Feb 04 08:53:49 2010 +0000
     7.2 +++ b/tools/examples/Makefile	Thu Feb 04 09:03:42 2010 +0000
     7.3 @@ -1,4 +1,4 @@
     7.4 -XEN_ROOT = ../../
     7.5 +XEN_ROOT = ../..
     7.6  include $(XEN_ROOT)/tools/Rules.mk
     7.7  
     7.8  # Init scripts.

     8.1 --- a/tools/hotplug/Linux/Makefile	Thu Feb 04 08:53:49 2010 +0000
     8.2 +++ b/tools/hotplug/Linux/Makefile	Thu Feb 04 09:03:42 2010 +0000
     8.3 @@ -1,4 +1,4 @@
     8.4 -XEN_ROOT = ../../../
     8.5 +XEN_ROOT = ../../..
     8.6  include $(XEN_ROOT)/tools/Rules.mk
     8.7  
     8.8  # Init scripts.

     9.1 --- a/tools/hotplug/Makefile	Thu Feb 04 08:53:49 2010 +0000
     9.2 +++ b/tools/hotplug/Makefile	Thu Feb 04 09:03:42 2010 +0000
     9.3 @@ -1,4 +1,4 @@
     9.4 -XEN_ROOT = ../../
     9.5 +XEN_ROOT = ../..
     9.6  include $(XEN_ROOT)/tools/Rules.mk
     9.7  
     9.8  SUBDIRS-y := common

    10.1 --- a/tools/hotplug/NetBSD/Makefile	Thu Feb 04 08:53:49 2010 +0000
    10.2 +++ b/tools/hotplug/NetBSD/Makefile	Thu Feb 04 09:03:42 2010 +0000
    10.3 @@ -1,4 +1,4 @@
    10.4 -XEN_ROOT = ../../../
    10.5 +XEN_ROOT = ../../..
    10.6  include $(XEN_ROOT)/tools/Rules.mk
    10.7  
    10.8  # Xen script dir and scripts to go there.