diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2010-02-04 09:03:42 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2010-02-04 09:03:42 +0000 |
| commit | f3bbcc79956e7b6d38587c4de0dd1feb24b5f358 (patch) | |
| tree | 1e2c934fc094ea971b2501e4a974427ca9dfce1b | |
| parent | d10651be94aa0a87222508089435ab35c9288ff3 (diff) | |
| download | xen-f3bbcc79956e7b6d38587c4de0dd1feb24b5f358.tar.gz xen-f3bbcc79956e7b6d38587c4de0dd1feb24b5f358.tar.bz2 xen-f3bbcc79956e7b6d38587c4de0dd1feb24b5f358.zip | |
tools: Do not append trailing slash to XEN_ROOT in Makefiles
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
| -rw-r--r-- | tools/Makefile | 2 | ||||
| -rw-r--r-- | tools/blktap2/drivers/Makefile | 2 | ||||
| -rw-r--r-- | tools/blktap2/include/Makefile | 2 | ||||
| -rw-r--r-- | tools/blktap2/lvm/Makefile | 4 | ||||
| -rw-r--r-- | tools/blktap2/vhd/Makefile | 4 | ||||
| -rw-r--r-- | tools/blktap2/vhd/lib/Makefile | 6 | ||||
| -rw-r--r-- | tools/examples/Makefile | 2 | ||||
| -rw-r--r-- | tools/hotplug/Linux/Makefile | 2 | ||||
| -rw-r--r-- | tools/hotplug/Makefile | 2 | ||||
| -rw-r--r-- | tools/hotplug/NetBSD/Makefile | 2 |
10 files changed, 14 insertions, 14 deletions
diff --git a/tools/Makefile b/tools/Makefile index 388a925d36..48c98026b8 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../ +XEN_ROOT = .. include $(XEN_ROOT)/tools/Rules.mk SUBDIRS-y := diff --git a/tools/blktap2/drivers/Makefile b/tools/blktap2/drivers/Makefile index 2fb2f2b887..edf8ef8c04 100644 --- a/tools/blktap2/drivers/Makefile +++ b/tools/blktap2/drivers/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT=../../../ +XEN_ROOT=../../.. BLKTAP_ROOT= .. include $(XEN_ROOT)/tools/Rules.mk diff --git a/tools/blktap2/include/Makefile b/tools/blktap2/include/Makefile index 7267eac53a..ca18512405 100644 --- a/tools/blktap2/include/Makefile +++ b/tools/blktap2/include/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT := ../../../ +XEN_ROOT := ../../.. include $(XEN_ROOT)/tools/Rules.mk .PHONY: all diff --git a/tools/blktap2/lvm/Makefile b/tools/blktap2/lvm/Makefile index 2077423d51..d5e07b2202 100644 --- a/tools/blktap2/lvm/Makefile +++ b/tools/blktap2/lvm/Makefile @@ -1,5 +1,5 @@ -XEN_ROOT = ../../../ -BLKTAP_ROOT := ../ +XEN_ROOT = ../../.. +BLKTAP_ROOT := .. include $(XEN_ROOT)/tools/Rules.mk ifeq ($(LVM_UTIL_TEST),y) diff --git a/tools/blktap2/vhd/Makefile b/tools/blktap2/vhd/Makefile index aa8257a1a1..48a6e540b1 100644 --- a/tools/blktap2/vhd/Makefile +++ b/tools/blktap2/vhd/Makefile @@ -1,5 +1,5 @@ -XEN_ROOT=../../../ -BLKTAP_ROOT := ../ +XEN_ROOT=../../.. +BLKTAP_ROOT := .. include $(XEN_ROOT)/tools/Rules.mk SUBDIRS-y := diff --git a/tools/blktap2/vhd/lib/Makefile b/tools/blktap2/vhd/lib/Makefile index 60e1217849..fa5b417619 100644 --- a/tools/blktap2/vhd/lib/Makefile +++ b/tools/blktap2/vhd/lib/Makefile @@ -1,12 +1,12 @@ -XEN_ROOT=../../../../ -BLKTAP_ROOT := ../../ +XEN_ROOT=../../../.. +BLKTAP_ROOT := ../.. include $(XEN_ROOT)/tools/Rules.mk LIBVHD-MAJOR = 1.0 LIBVHD-MINOR = 0 LIBVHD-SONAME = libvhd.so.$(LIBVHD-MAJOR) -LVM-UTIL-OBJ := $(BLKTAP_ROOT)lvm/lvm-util.o +LVM-UTIL-OBJ := $(BLKTAP_ROOT)/lvm/lvm-util.o LIBVHD-BUILD := libvhd.a diff --git a/tools/examples/Makefile b/tools/examples/Makefile index bb3a72c9ba..a911fff057 100644 --- a/tools/examples/Makefile +++ b/tools/examples/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../ +XEN_ROOT = ../.. include $(XEN_ROOT)/tools/Rules.mk # Init scripts. diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile index b5f9800de0..fa9e2b5c45 100644 --- a/tools/hotplug/Linux/Makefile +++ b/tools/hotplug/Linux/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../../ +XEN_ROOT = ../../.. include $(XEN_ROOT)/tools/Rules.mk # Init scripts. diff --git a/tools/hotplug/Makefile b/tools/hotplug/Makefile index 979e916d7f..e22cae4fa5 100644 --- a/tools/hotplug/Makefile +++ b/tools/hotplug/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../ +XEN_ROOT = ../.. include $(XEN_ROOT)/tools/Rules.mk SUBDIRS-y := common diff --git a/tools/hotplug/NetBSD/Makefile b/tools/hotplug/NetBSD/Makefile index 06eee0556c..c043977601 100644 --- a/tools/hotplug/NetBSD/Makefile +++ b/tools/hotplug/NetBSD/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../../ +XEN_ROOT = ../../.. include $(XEN_ROOT)/tools/Rules.mk # Xen script dir and scripts to go there. |