aboutsummaryrefslogtreecommitdiffstats
path: root/tools/blktap2/vhd
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2010-02-04 09:03:42 +0000
committerKeir Fraser <keir.fraser@citrix.com>2010-02-04 09:03:42 +0000
commitf3bbcc79956e7b6d38587c4de0dd1feb24b5f358 (patch)
tree1e2c934fc094ea971b2501e4a974427ca9dfce1b /tools/blktap2/vhd
parentd10651be94aa0a87222508089435ab35c9288ff3 (diff)
downloadxen-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>
Diffstat (limited to 'tools/blktap2/vhd')
-rw-r--r--tools/blktap2/vhd/Makefile4
-rw-r--r--tools/blktap2/vhd/lib/Makefile6
2 files changed, 5 insertions, 5 deletions
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