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/libfsimage/Makefile | 2 +- tools/libfsimage/common/Makefile | 2 +- tools/libfsimage/ext2fs-lib/Makefile | 2 +- tools/libfsimage/ext2fs/Makefile | 2 +- tools/libfsimage/fat/Makefile | 2 +- tools/libfsimage/iso9660/Makefile | 2 +- tools/libfsimage/reiserfs/Makefile | 2 +- tools/libfsimage/ufs/Makefile | 2 +- tools/libfsimage/zfs/Makefile | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) (limited to 'tools/libfsimage') diff --git a/tools/libfsimage/Makefile b/tools/libfsimage/Makefile index d5194fe54d..2075a192ab 100644 --- a/tools/libfsimage/Makefile +++ b/tools/libfsimage/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../.. +XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk SUBDIRS-y = common ufs reiserfs iso9660 fat zfs diff --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile index 4f72bb5eea..afb1e96e0d 100644 --- a/tools/libfsimage/common/Makefile +++ b/tools/libfsimage/common/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk MAJOR = 1.0 diff --git a/tools/libfsimage/ext2fs-lib/Makefile b/tools/libfsimage/ext2fs-lib/Makefile index a60b3a58a5..142207f63b 100644 --- a/tools/libfsimage/ext2fs-lib/Makefile +++ b/tools/libfsimage/ext2fs-lib/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. LIB_SRCS-y = ext2fs-lib.c diff --git a/tools/libfsimage/ext2fs/Makefile b/tools/libfsimage/ext2fs/Makefile index 43a4501f5d..8ff4c71a1c 100644 --- a/tools/libfsimage/ext2fs/Makefile +++ b/tools/libfsimage/ext2fs/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. LIB_SRCS-y = fsys_ext2fs.c diff --git a/tools/libfsimage/fat/Makefile b/tools/libfsimage/fat/Makefile index bfc55e4f8c..2911a0e0e7 100644 --- a/tools/libfsimage/fat/Makefile +++ b/tools/libfsimage/fat/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. LIB_SRCS-y = fsys_fat.c diff --git a/tools/libfsimage/iso9660/Makefile b/tools/libfsimage/iso9660/Makefile index 6e7169490b..4096cafa0c 100644 --- a/tools/libfsimage/iso9660/Makefile +++ b/tools/libfsimage/iso9660/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. LIB_SRCS-y = fsys_iso9660.c diff --git a/tools/libfsimage/reiserfs/Makefile b/tools/libfsimage/reiserfs/Makefile index c71fff8843..57f286b256 100644 --- a/tools/libfsimage/reiserfs/Makefile +++ b/tools/libfsimage/reiserfs/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. LIB_SRCS-y = fsys_reiserfs.c diff --git a/tools/libfsimage/ufs/Makefile b/tools/libfsimage/ufs/Makefile index b7218c2b3f..c1371080f5 100644 --- a/tools/libfsimage/ufs/Makefile +++ b/tools/libfsimage/ufs/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. LIB_SRCS-y = fsys_ufs.c diff --git a/tools/libfsimage/zfs/Makefile b/tools/libfsimage/zfs/Makefile index 1f55def8ce..9fb0aabe78 100644 --- a/tools/libfsimage/zfs/Makefile +++ b/tools/libfsimage/zfs/Makefile @@ -22,7 +22,7 @@ # Use is subject to license terms. # -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. CFLAGS += -DFSYS_ZFS -DFSIMAGE -I$(XEN_ROOT)/tools/libfsimage/zfs LIB_SRCS-y = zfs_lzjb.c zfs_sha256.c zfs_fletcher.c fsi_zfs.c fsys_zfs.c -- cgit v1.2.3