From 547cb1849c1d6338d3141817f67c3ddd2c2beff5 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Thu, 17 Mar 2011 10:36:25 +0000 Subject: build: Make XEN_ROOT an absolute path. Otherwise make can search the path relative to certain standard paths such as /usr/include (e.g., the line '-include $(XEN_ROOT)/.config' in Config.mk suffers from this). Signed-off-by: Keir Fraser --- tools/blktap2/Makefile | 2 +- tools/blktap2/control/Makefile | 2 +- tools/blktap2/drivers/Makefile | 2 +- tools/blktap2/include/Makefile | 2 +- tools/blktap2/lvm/Makefile | 2 +- tools/blktap2/vhd/Makefile | 2 +- tools/blktap2/vhd/lib/Makefile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'tools/blktap2') diff --git a/tools/blktap2/Makefile b/tools/blktap2/Makefile index 51a9a4986e..d41758f58e 100644 --- a/tools/blktap2/Makefile +++ b/tools/blktap2/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../.. +XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk CFLAGS += $(CFLAGS_libxenctrl) diff --git a/tools/blktap2/control/Makefile b/tools/blktap2/control/Makefile index 8cab32e52e..4030ceb300 100644 --- a/tools/blktap2/control/Makefile +++ b/tools/blktap2/control/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT := ../../../ +XEN_ROOT := $(CURDIR)/../../../ include $(XEN_ROOT)/tools/Rules.mk MAJOR = 1.0 diff --git a/tools/blktap2/drivers/Makefile b/tools/blktap2/drivers/Makefile index eb20c7a1c9..b718c0839f 100644 --- a/tools/blktap2/drivers/Makefile +++ b/tools/blktap2/drivers/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT=../../.. +XEN_ROOT=$(CURDIR)/../../.. BLKTAP_ROOT= .. include $(XEN_ROOT)/tools/Rules.mk diff --git a/tools/blktap2/include/Makefile b/tools/blktap2/include/Makefile index ca18512405..f85351ec87 100644 --- a/tools/blktap2/include/Makefile +++ b/tools/blktap2/include/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT := ../../.. +XEN_ROOT := $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk .PHONY: all diff --git a/tools/blktap2/lvm/Makefile b/tools/blktap2/lvm/Makefile index d5e07b2202..dc0ebfeb8c 100644 --- a/tools/blktap2/lvm/Makefile +++ b/tools/blktap2/lvm/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. BLKTAP_ROOT := .. include $(XEN_ROOT)/tools/Rules.mk diff --git a/tools/blktap2/vhd/Makefile b/tools/blktap2/vhd/Makefile index f356f5ec6f..cb5e14593d 100644 --- a/tools/blktap2/vhd/Makefile +++ b/tools/blktap2/vhd/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT=../../.. +XEN_ROOT=$(CURDIR)/../../.. BLKTAP_ROOT := .. include $(XEN_ROOT)/tools/Rules.mk diff --git a/tools/blktap2/vhd/lib/Makefile b/tools/blktap2/vhd/lib/Makefile index 6f5f04c1c1..1b3fc692aa 100644 --- a/tools/blktap2/vhd/lib/Makefile +++ b/tools/blktap2/vhd/lib/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT=../../../.. +XEN_ROOT=$(CURDIR)/../../../.. BLKTAP_ROOT := ../.. include $(XEN_ROOT)/tools/Rules.mk -- cgit v1.2.3