[Xen-changelog] [xen-unstable] tools: Do not append trailing slash to XEN_ROOT in Makefiles

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1265274222 0
# Node ID 845d04d505d069fc0fec09c95e9dcc7911d41a15
# Parent  d311d1efc25e3d270c0b7f14bd4d43bbfbcb35dd
tools: Do not append trailing slash to XEN_ROOT in Makefiles

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 tools/Makefile                 |    2 +-
 tools/blktap2/drivers/Makefile |    2 +-
 tools/blktap2/include/Makefile |    2 +-
 tools/blktap2/lvm/Makefile     |    4 ++--
 tools/blktap2/vhd/Makefile     |    4 ++--
 tools/blktap2/vhd/lib/Makefile |    6 +++---
 tools/examples/Makefile        |    2 +-
 tools/hotplug/Linux/Makefile   |    2 +-
 tools/hotplug/Makefile         |    2 +-
 tools/hotplug/NetBSD/Makefile  |    2 +-
 10 files changed, 14 insertions(+), 14 deletions(-)

diff -r d311d1efc25e -r 845d04d505d0 tools/Makefile
--- a/tools/Makefile    Thu Feb 04 08:53:49 2010 +0000
+++ b/tools/Makefile    Thu Feb 04 09:03:42 2010 +0000
@@ -1,4 +1,4 @@ XEN_ROOT = ../
-XEN_ROOT = ../
+XEN_ROOT = ..
 include $(XEN_ROOT)/tools/Rules.mk
 
 SUBDIRS-y :=
diff -r d311d1efc25e -r 845d04d505d0 tools/blktap2/drivers/Makefile
--- a/tools/blktap2/drivers/Makefile    Thu Feb 04 08:53:49 2010 +0000
+++ b/tools/blktap2/drivers/Makefile    Thu Feb 04 09:03:42 2010 +0000
@@ -1,4 +1,4 @@ XEN_ROOT=../../../
-XEN_ROOT=../../../
+XEN_ROOT=../../..
 BLKTAP_ROOT= ..
 include $(XEN_ROOT)/tools/Rules.mk
 
diff -r d311d1efc25e -r 845d04d505d0 tools/blktap2/include/Makefile
--- a/tools/blktap2/include/Makefile    Thu Feb 04 08:53:49 2010 +0000
+++ b/tools/blktap2/include/Makefile    Thu Feb 04 09:03:42 2010 +0000
@@ -1,4 +1,4 @@ XEN_ROOT := ../../../
-XEN_ROOT := ../../../
+XEN_ROOT := ../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 .PHONY: all
diff -r d311d1efc25e -r 845d04d505d0 tools/blktap2/lvm/Makefile
--- a/tools/blktap2/lvm/Makefile        Thu Feb 04 08:53:49 2010 +0000
+++ b/tools/blktap2/lvm/Makefile        Thu Feb 04 09:03:42 2010 +0000
@@ -1,5 +1,5 @@ XEN_ROOT = ../../../
-XEN_ROOT = ../../../
-BLKTAP_ROOT := ../
+XEN_ROOT = ../../..
+BLKTAP_ROOT := ..
 include $(XEN_ROOT)/tools/Rules.mk
 
 ifeq ($(LVM_UTIL_TEST),y)
diff -r d311d1efc25e -r 845d04d505d0 tools/blktap2/vhd/Makefile
--- a/tools/blktap2/vhd/Makefile        Thu Feb 04 08:53:49 2010 +0000
+++ b/tools/blktap2/vhd/Makefile        Thu Feb 04 09:03:42 2010 +0000
@@ -1,5 +1,5 @@ XEN_ROOT=../../../
-XEN_ROOT=../../../
-BLKTAP_ROOT := ../
+XEN_ROOT=../../..
+BLKTAP_ROOT := ..
 include $(XEN_ROOT)/tools/Rules.mk
 
 SUBDIRS-y         :=
diff -r d311d1efc25e -r 845d04d505d0 tools/blktap2/vhd/lib/Makefile
--- a/tools/blktap2/vhd/lib/Makefile    Thu Feb 04 08:53:49 2010 +0000
+++ b/tools/blktap2/vhd/lib/Makefile    Thu Feb 04 09:03:42 2010 +0000
@@ -1,12 +1,12 @@ XEN_ROOT=../../../../
-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 -r d311d1efc25e -r 845d04d505d0 tools/examples/Makefile
--- a/tools/examples/Makefile   Thu Feb 04 08:53:49 2010 +0000
+++ b/tools/examples/Makefile   Thu Feb 04 09:03:42 2010 +0000
@@ -1,4 +1,4 @@ XEN_ROOT = ../../
-XEN_ROOT = ../../
+XEN_ROOT = ../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 # Init scripts.
diff -r d311d1efc25e -r 845d04d505d0 tools/hotplug/Linux/Makefile
--- a/tools/hotplug/Linux/Makefile      Thu Feb 04 08:53:49 2010 +0000
+++ b/tools/hotplug/Linux/Makefile      Thu Feb 04 09:03:42 2010 +0000
@@ -1,4 +1,4 @@ XEN_ROOT = ../../../
-XEN_ROOT = ../../../
+XEN_ROOT = ../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 # Init scripts.
diff -r d311d1efc25e -r 845d04d505d0 tools/hotplug/Makefile
--- a/tools/hotplug/Makefile    Thu Feb 04 08:53:49 2010 +0000
+++ b/tools/hotplug/Makefile    Thu Feb 04 09:03:42 2010 +0000
@@ -1,4 +1,4 @@ XEN_ROOT = ../../
-XEN_ROOT = ../../
+XEN_ROOT = ../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 SUBDIRS-y := common
diff -r d311d1efc25e -r 845d04d505d0 tools/hotplug/NetBSD/Makefile
--- a/tools/hotplug/NetBSD/Makefile     Thu Feb 04 08:53:49 2010 +0000
+++ b/tools/hotplug/NetBSD/Makefile     Thu Feb 04 09:03:42 2010 +0000
@@ -1,4 +1,4 @@ XEN_ROOT = ../../../
-XEN_ROOT = ../../../
+XEN_ROOT = ../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 # Xen script dir and scripts to go there.

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