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/include/Makefile | 10 +++++----- tools/include/xen-foreign/Makefile | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'tools/include') diff --git a/tools/include/Makefile b/tools/include/Makefile index 62c27170ef..cbff41b93e 100644 --- a/tools/include/Makefile +++ b/tools/include/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../.. +XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk .PHONY: all @@ -11,11 +11,11 @@ xen-foreign: xen/.dir: @rm -rf xen mkdir -p xen/libelf - ln -sf ../$(XEN_ROOT)/xen/include/public/COPYING xen - ln -sf $(addprefix ../,$(wildcard $(XEN_ROOT)/xen/include/public/*.h)) xen - ln -sf $(addprefix ../$(XEN_ROOT)/xen/include/public/,arch-ia64 arch-x86 hvm io xsm) xen + ln -sf $(XEN_ROOT)/xen/include/public/COPYING xen + ln -sf $(wildcard $(XEN_ROOT)/xen/include/public/*.h) xen + ln -sf $(addprefix $(XEN_ROOT)/xen/include/public/,arch-ia64 arch-x86 hvm io xsm) xen ln -sf ../xen-sys/$(XEN_OS) xen/sys - ln -sf $(addprefix ../../$(XEN_ROOT)/xen/include/xen/,libelf.h elfstructs.h) xen/libelf/ + ln -sf $(addprefix $(XEN_ROOT)/xen/include/xen/,libelf.h elfstructs.h) xen/libelf/ ln -s ../xen-foreign xen/foreign touch $@ diff --git a/tools/include/xen-foreign/Makefile b/tools/include/xen-foreign/Makefile index 77a535f4d0..0de9018310 100644 --- a/tools/include/xen-foreign/Makefile +++ b/tools/include/xen-foreign/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT=../../.. +XEN_ROOT=$(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk ROOT = $(XEN_ROOT)/xen/include/public -- cgit v1.2.3