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 <keir@xen.org>

diff --git a/Config.mk b/Config.mk
index 9c16c1f2ce1271f1727067b97edbc979530c10d3..02feb1ba720611a11bfd5cc088f4813463b787f0 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -102,27 +102,10 @@ define cc-ver-check-closure
     endif
 endef
 
-define absolutify_xen_root
-    case "$(XEN_ROOT)" in                                          \
-    /*) XEN_ROOT=$(XEN_ROOT) ;;                                    \
-    *)  xen_root_lhs=`pwd`;                                        \
-        xen_root_rhs=$(XEN_ROOT)/;                                 \
-        while [ "x$${xen_root_rhs#../}" != "x$$xen_root_rhs" ]; do \
-            xen_root_rhs="$${xen_root_rhs#../}";                   \
-            xen_root_rhs="$${xen_root_rhs#/}";                     \
-            xen_root_rhs="$${xen_root_rhs#/}";                     \
-            xen_root_lhs="$${xen_root_lhs%/*}";                    \
-        done;                                                      \
-        XEN_ROOT="$$xen_root_lhs/$$xen_root_rhs" ;;                \
-    esac;                                                          \
-    export XEN_ROOT
-endef
-
 define buildmakevars2shellvars
-    PREFIX="$(PREFIX)";                                            \
-    XEN_SCRIPT_DIR="$(XEN_SCRIPT_DIR)";                            \
-    export PREFIX;                                                 \
-    export XEN_SCRIPT_DIR
+    export PREFIX="$(PREFIX)";                                            \
+    export XEN_SCRIPT_DIR="$(XEN_SCRIPT_DIR)";                            \
+    export XEN_ROOT="$(XEN_ROOT)"
 endef
 
 buildmakevars2file = $(eval $(call buildmakevars2file-closure,$(1)))

diff --git a/docs/Makefile b/docs/Makefile
index dce7cd9d3174f8b159e807ae03b443445f0b771a..1b8423dc06345c01de60c146702d05765d0222e5 100644 (file)
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-XEN_ROOT=..
+XEN_ROOT=$(CURDIR)/..
 include $(XEN_ROOT)/Config.mk
 include $(XEN_ROOT)/docs/Docs.mk
 

diff --git a/docs/xen-api/Makefile b/docs/xen-api/Makefile
index a25286a30a85a838bcbfdebbf26c75f407a7f37a..77a0117a6fee5fa2a6bd7bb2660166d093546b9d 100644 (file)
--- a/docs/xen-api/Makefile
+++ b/docs/xen-api/Makefile
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-XEN_ROOT=../..
+XEN_ROOT=$(CURDIR)/../..
 include $(XEN_ROOT)/Config.mk
 include $(XEN_ROOT)/docs/Docs.mk
 

diff --git a/extras/mini-os/Config.mk b/extras/mini-os/Config.mk
index a1a2283ecc2be46e9a4a9decf72d10394690a5e2..806d4ff8fd955ae3ae7530de2fe15ae5360107d3 100644 (file)
--- a/extras/mini-os/Config.mk
+++ b/extras/mini-os/Config.mk
@@ -38,15 +38,15 @@ EXTRA_INC = $(ARCH_INC)
 # This must be before include minios.mk!
 include $(MINI-OS_ROOT)/$(TARGET_ARCH_DIR)/arch.mk
 
-extra_incl := $(foreach dir,$(EXTRA_INC),-isystem $(CURDIR)/$(MINI-OS_ROOT)/include/$(dir))
+extra_incl := $(foreach dir,$(EXTRA_INC),-isystem $(MINI-OS_ROOT)/include/$(dir))
 
-DEF_CPPFLAGS += -isystem $(CURDIR)/$(MINI-OS_ROOT)/include
+DEF_CPPFLAGS += -isystem $(MINI-OS_ROOT)/include
 DEF_CPPFLAGS += -D__MINIOS__
 
 ifeq ($(libc),y)
 DEF_CPPFLAGS += -DHAVE_LIBC
-DEF_CPPFLAGS += -isystem $(CURDIR)/$(MINI-OS_ROOT)/include/posix
-DEF_CPPFLAGS += -isystem $(CURDIR)/$(XEN_ROOT)/tools/xenstore
+DEF_CPPFLAGS += -isystem $(MINI-OS_ROOT)/include/posix
+DEF_CPPFLAGS += -isystem $(XEN_ROOT)/tools/xenstore
 endif
 
 ifneq ($(LWIPDIR),)

diff --git a/extras/mini-os/Makefile b/extras/mini-os/Makefile
index 78e0c9d527ab20e2aa75c4ea48f64d1a31b9e645..c2ee06226665fb6c1b2dd0041d811c59970d3154 100644 (file)
--- a/extras/mini-os/Makefile
+++ b/extras/mini-os/Makefile
@@ -4,7 +4,7 @@
 # Makefile and a arch.mk.
 #
 
-export XEN_ROOT = ../..
+export XEN_ROOT = $(CURDIR)/../..
 include $(XEN_ROOT)/Config.mk
 OBJ_DIR ?= $(CURDIR)
 

diff --git a/extras/mini-os/arch/ia64/Makefile b/extras/mini-os/arch/ia64/Makefile
index 405066215d282098069d84286626a6a40b8c7d1b..ca3120e10e72837e2366a3528008ad324bc35889 100644 (file)
--- a/extras/mini-os/arch/ia64/Makefile
+++ b/extras/mini-os/arch/ia64/Makefile
@@ -2,7 +2,7 @@
 # Special makefile for ia64.
 #
 
-XEN_ROOT = ../../../..
+XEN_ROOT = $(CURDIR)/../../../..
 include $(XEN_ROOT)/Config.mk
 
 include ../../Config.mk

diff --git a/extras/mini-os/arch/x86/Makefile b/extras/mini-os/arch/x86/Makefile
index 3c5fb6ae782132528d6e852e3b3850daf2e5eae8..1073e36267e5de00aff7872ac85f340f0a7625a9 100644 (file)
--- a/extras/mini-os/arch/x86/Makefile
+++ b/extras/mini-os/arch/x86/Makefile
@@ -3,7 +3,7 @@
 # It's is used for x86_32, x86_32y and x86_64
 #
 
-XEN_ROOT = ../../../..
+XEN_ROOT = $(CURDIR)/../../../..
 include $(XEN_ROOT)/Config.mk
 include ../../Config.mk
 

diff --git a/stubdom/Makefile b/stubdom/Makefile
index d1c6b0a5b5041000102b790e30eaafda500ab3b1..938fc0ac17ad514b808cd13bfe21fa2e009396e7 100644 (file)
--- a/stubdom/Makefile
+++ b/stubdom/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ..
+XEN_ROOT = $(CURDIR)/..
 MINI_OS = $(XEN_ROOT)/extras/mini-os
 
 export XEN_OS=MiniOS
@@ -64,7 +64,7 @@ $(call cc-options-add,TARGET_CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS))
 GCC_INSTALL = $(shell LANG=C gcc -print-search-dirs | sed -n -e 's/install: \(.*\)/\1/p')
 TARGET_CPPFLAGS += -U __linux__ -U __FreeBSD__ -U __sun__
 TARGET_CPPFLAGS += -nostdinc
-TARGET_CPPFLAGS += -isystem $(CURDIR)/$(MINI_OS)/include/posix
+TARGET_CPPFLAGS += -isystem $(MINI_OS)/include/posix
 TARGET_CPPFLAGS += -isystem $(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/include
 TARGET_CPPFLAGS += -isystem $(GCC_INSTALL)include
 TARGET_CPPFLAGS += -isystem $(CURDIR)/lwip-$(XEN_TARGET_ARCH)/src/include
@@ -224,7 +224,7 @@ $(XEN_ROOT)/tools/ioemu-dir:
 ioemu/linkfarm.stamp: $(XEN_ROOT)/tools/ioemu-dir
        mkdir -p ioemu
        set -e;                                                                 \
-       $(absolutify_xen_root);                                                 \
+       $(buildmakevars2shellvars);                                             \
        cd ioemu;                                                               \
        src="$$XEN_ROOT/tools/ioemu-dir"; export src;                           \
        (cd $$src && find * -type d -print) | xargs mkdir -p;                   \
@@ -244,24 +244,24 @@ endif
 
 mk-headers-$(XEN_TARGET_ARCH): ioemu/linkfarm.stamp
        mkdir -p include/xen && \
-          ln -sf $(addprefix ../../,$(wildcard $(XEN_ROOT)/xen/include/public/*.h)) include/xen && \
-          ln -sf $(addprefix ../../$(XEN_ROOT)/xen/include/public/,arch-ia64 arch-x86 hvm io xsm) include/xen && \
-          ( [ -h include/xen/sys ] || ln -sf ../../$(XEN_ROOT)/tools/include/xen-sys/MiniOS include/xen/sys ) && \
-          ( [ -h include/xen/libelf ] || ln -sf ../../$(XEN_ROOT)/tools/include/xen/libelf include/xen/libelf ) && \
+          ln -sf $(wildcard $(XEN_ROOT)/xen/include/public/*.h) include/xen && \
+          ln -sf $(addprefix $(XEN_ROOT)/xen/include/public/,arch-ia64 arch-x86 hvm io xsm) include/xen && \
+          ( [ -h include/xen/sys ] || ln -sf $(XEN_ROOT)/tools/include/xen-sys/MiniOS include/xen/sys ) && \
+          ( [ -h include/xen/libelf ] || ln -sf $(XEN_ROOT)/tools/include/xen/libelf include/xen/libelf ) && \
          mkdir -p include/xen-foreign && \
-         ln -sf $(addprefix ../../,$(wildcard $(XEN_ROOT)/tools/include/xen-foreign/*)) include/xen-foreign/ && \
+         ln -sf $(wildcard $(XEN_ROOT)/tools/include/xen-foreign/*) include/xen-foreign/ && \
          $(CROSS_MAKE) -C include/xen-foreign/ && \
          ( [ -h include/xen/foreign ] || ln -sf ../xen-foreign include/xen/foreign )
        mkdir -p libxc-$(XEN_TARGET_ARCH)
        [ -h libxc-$(XEN_TARGET_ARCH)/Makefile ] || ( cd libxc-$(XEN_TARGET_ARCH) && \
-         ln -sf ../$(XEN_ROOT)/tools/libxc/*.h . && \
-         ln -sf ../$(XEN_ROOT)/tools/libxc/*.c . && \
-         ln -sf ../$(XEN_ROOT)/tools/libxc/Makefile . )
+         ln -sf $(XEN_ROOT)/tools/libxc/*.h . && \
+         ln -sf $(XEN_ROOT)/tools/libxc/*.c . && \
+         ln -sf $(XEN_ROOT)/tools/libxc/Makefile . )
        mkdir -p libxc-$(XEN_TARGET_ARCH)/$(XEN_TARGET_ARCH)
        [ -h libxc-$(XEN_TARGET_ARCH)/$(XEN_TARGET_ARCH) ] || ( cd libxc-$(XEN_TARGET_ARCH)/$(XEN_TARGET_ARCH) && \
-         ln -sf ../$(XEN_ROOT)/tools/libxc/$(XEN_TARGET_ARCH)/*.c . && \
-         ln -sf ../$(XEN_ROOT)/tools/libxc/$(XEN_TARGET_ARCH)/*.h . && \
-         ln -sf ../$(XEN_ROOT)/tools/libxc/$(XEN_TARGET_ARCH)/Makefile . )
+         ln -sf $(XEN_ROOT)/tools/libxc/$(XEN_TARGET_ARCH)/*.c . && \
+         ln -sf $(XEN_ROOT)/tools/libxc/$(XEN_TARGET_ARCH)/*.h . && \
+         ln -sf $(XEN_ROOT)/tools/libxc/$(XEN_TARGET_ARCH)/Makefile . )
        $(CROSS_MAKE) -C $(MINI_OS) links
        touch mk-headers-$(XEN_TARGET_ARCH)
 
@@ -290,8 +290,7 @@ libxc-$(XEN_TARGET_ARCH)/libxenctrl.a: cross-zlib
 .PHONY: ioemu
 ioemu: cross-zlib cross-libpci libxc
        [ -f ioemu/config-host.mak ] || \
-         ( $(absolutify_xen_root); \
-           $(buildmakevars2shellvars); \
+         ( $(buildmakevars2shellvars); \
            cd ioemu ; \
            LWIPDIR=$(CURDIR)/lwip-$(XEN_TARGET_ARCH) \
            TARGET_CPPFLAGS="$(TARGET_CPPFLAGS)" \

diff --git a/stubdom/c/Makefile b/stubdom/c/Makefile
index b5cb8e2cd74a84b89ad51d85f8b8e494a77c2e27..c646c26e74f17afb77931b79110daa706d0b46ec 100644 (file)
--- a/stubdom/c/Makefile
+++ b/stubdom/c/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 
 include $(XEN_ROOT)/Config.mk
 

diff --git a/stubdom/caml/Makefile b/stubdom/caml/Makefile
index 5f27db67a333ff0d4a69e488a4f4c7c68c7d2ab5..e79c98df135715f9cb06c0cba8d58426cee9daa2 100644 (file)
--- a/stubdom/caml/Makefile
+++ b/stubdom/caml/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 
 include $(XEN_ROOT)/Config.mk
 

diff --git a/stubdom/grub/Makefile b/stubdom/grub/Makefile
index 77e5eb97d73a5886ab8585b5f7cfe695617b83ac..d6e3a1e5b61ff84b92eec8d36fd528fe26a82707 100644 (file)
--- a/stubdom/grub/Makefile
+++ b/stubdom/grub/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 
 include $(XEN_ROOT)/Config.mk
 vpath %.c ../grub-upstream

diff --git a/stubdom/pciutils.patch b/stubdom/pciutils.patch
index ce9e987b2c97fccb5fa9a822ccb013af6feb6c65..5ab84d6cce53ffb2faf18bbe995d9d1f996fb8a2 100644 (file)
--- a/stubdom/pciutils.patch
+++ b/stubdom/pciutils.patch
@@ -38,7 +38,7 @@ diff -urN pciutils-2.2.9.orig/lib/access.c pciutils-2.2.9/lib/access.c
  endif
  
 +ifdef PCI_OS_MINIOS
-+XEN_ROOT=../../..
++XEN_ROOT=$(CURDIR)/../../..
 +include $(XEN_ROOT)/Config.mk
 +OBJS += minios.o
 +endif

diff --git a/tools/Makefile b/tools/Makefile
index a7c14878074be69e72f218d54dc1aee01c5dbd1c..3ac76e6b435116fc5aaff0a8415138dc9d399036 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ..
+XEN_ROOT = $(CURDIR)/..
 include $(XEN_ROOT)/tools/Rules.mk
 
 SUBDIRS-y :=
@@ -105,7 +105,6 @@ ioemu-dir-find:
                ln -sf ioemu-remote ioemu-dir; \
        fi
        set -e; \
-               $(absolutify_xen_root); \
                $(buildmakevars2shellvars); \
                cd ioemu-dir; \
                $(QEMU_ROOT)/xen-setup $(IOEMU_CONFIGURE_CROSS)
@@ -123,7 +122,6 @@ subdir-all-ioemu-dir subdir-install-ioemu-dir: ioemu-dir-find
 
 subdir-clean-ioemu-dir:
        set -e; if test -d ioemu-dir/.; then \
-               $(absolutify_xen_root); \
                $(buildmakevars2shellvars); \
                $(MAKE) -C ioemu-dir clean; \
        fi

diff --git a/tools/blktap/Makefile b/tools/blktap/Makefile
index 21c9556f60698119a45dd2998489e77b9b94947f..40205660e86e0459c2ac7549ac047386850ac547 100644 (file)
--- a/tools/blktap/Makefile
+++ b/tools/blktap/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 SUBDIRS-y :=

diff --git a/tools/blktap/drivers/Makefile b/tools/blktap/drivers/Makefile
index d2615d09b68152af25f68122a3dbf0c49193bff1..7265c76bd4be25dca81b262be4244d1eaf5b58db 100644 (file)
--- a/tools/blktap/drivers/Makefile
+++ b/tools/blktap/drivers/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 IBIN         = blktapctrl tapdisk

diff --git a/tools/blktap/lib/Makefile b/tools/blktap/lib/Makefile
index 206e060114d28dea16df1d6bfd1e75687396bc3a..505625e0772aa2e6424874cef97fc41d1f9780b3 100644 (file)
--- a/tools/blktap/lib/Makefile
+++ b/tools/blktap/lib/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 MAJOR    = 3.0

diff --git a/tools/blktap2/Makefile b/tools/blktap2/Makefile
index 51a9a4986eb6f702002eecaf7da72506b3382df2..d41758f58eeefefca7bd2988f4ec70d4a1057dc6 100644 (file)
--- 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 8cab32e52e341984f606f9de1dc9c98d2bf9677a..4030ceb3003edda9267077e515b48aa22039f76c 100644 (file)
--- 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 eb20c7a1c9e5e13432cde1474a7f23972aae64d2..b718c0839fef609a685bc3447403e75b4660d4fa 100644 (file)
--- 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 ca18512405f44ee64b0fecacfbb9e53bb5f722bc..f85351ec8763e748d5bb7ae713e7d91dcae76761 100644 (file)
--- 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 d5e07b2202dc5287efaf829f3445a2f4003144a6..dc0ebfeb8c5c2e59b47318682792d3346fb061e4 100644 (file)
--- 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 f356f5ec6facae0a3c2dce9043c9d93d9aefdfe7..cb5e14593ddc2ab69a5f538855136d40cb94b701 100644 (file)
--- 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 6f5f04c1c152684929f9926a8082939ae03e51a7..1b3fc692aaf19e081845bc3ac7f7a1c304a27453 100644 (file)
--- 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
 

diff --git a/tools/check/Makefile b/tools/check/Makefile
index adfbdaea3ad343eec3f6e0027542f8111435e9ff..f24816601ba37259ab6da3101f60cf1139995e19 100644 (file)
--- a/tools/check/Makefile
+++ b/tools/check/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 .PHONY: all install

diff --git a/tools/console/Makefile b/tools/console/Makefile
index 3dc4c1b3d5ada460635ac7a8385b3d3c5610dcd6..5a119b44cd96dba4df3ed7907da0924164da062a 100644 (file)
--- a/tools/console/Makefile
+++ b/tools/console/Makefile
@@ -1,5 +1,5 @@
 
-XEN_ROOT=../..
+XEN_ROOT=$(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS  += -Werror

diff --git a/tools/console/testsuite/Makefile b/tools/console/testsuite/Makefile
index 71deb0a6f8296f5a67601e0a080c61b986aff32b..d9e43809f6c2e1b76c1d0fdbbfc33ae61d038713 100644 (file)
--- a/tools/console/testsuite/Makefile
+++ b/tools/console/testsuite/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 LDFLAGS=-static

diff --git a/tools/debugger/gdbsx/Makefile b/tools/debugger/gdbsx/Makefile
index ce206e2ea5b9182450d3283362d99872aa96d19d..7938dd84a9801c49ce5167ea629394e1ea1cd002 100644 (file)
--- a/tools/debugger/gdbsx/Makefile
+++ b/tools/debugger/gdbsx/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 include ./Rules.mk
 
 .PHONY: all

diff --git a/tools/debugger/gdbsx/gx/Makefile b/tools/debugger/gdbsx/gx/Makefile
index 6dd8bf1ec5795e0bde28a9e459dcf158f4044a00..9a0ff07d10f4c48b6a4126bfe86d9b08c8ad805e 100644 (file)
--- a/tools/debugger/gdbsx/gx/Makefile
+++ b/tools/debugger/gdbsx/gx/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../../..
+XEN_ROOT = $(CURDIR)/../../../..
 include ../Rules.mk
 
 GX_OBJS := gx_comm.o gx_main.o gx_utils.o gx_local.o

diff --git a/tools/debugger/gdbsx/xg/Makefile b/tools/debugger/gdbsx/xg/Makefile
index c3e6185d94dea960ef43e6d5b02b1b619dff38bb..2d0256529059a2be031bd06524e7cb5a623dc852 100644 (file)
--- a/tools/debugger/gdbsx/xg/Makefile
+++ b/tools/debugger/gdbsx/xg/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../../..
+XEN_ROOT = $(CURDIR)/../../../..
 include ../Rules.mk
 
 XG_HDRS := xg_public.h 

diff --git a/tools/debugger/kdd/Makefile b/tools/debugger/kdd/Makefile
index 0211c008dd1ab5a92fc857f8329a77600d16a5bc..db162aa0fb3be269d9172f15bc296d7eda02f697 100644 (file)
--- a/tools/debugger/kdd/Makefile
+++ b/tools/debugger/kdd/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS  += $(CFLAGS_libxenctrl)

diff --git a/tools/debugger/xenitp/Makefile b/tools/debugger/xenitp/Makefile
index e1deaa480efbda2e575a5ff76770597ed45e5e9f..b4d5473fb95a83dd9d2655ee01f055082814082b 100644 (file)
--- a/tools/debugger/xenitp/Makefile
+++ b/tools/debugger/xenitp/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT=../../..
+XEN_ROOT=$(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 #CFLAGS  += -Werror -g -O0

diff --git a/tools/examples/Makefile b/tools/examples/Makefile
index 3d820c5f185bafcbd96b16fced47e5f1213bd9fd..1a3b049c325c0a76258880b55dfba6a9dd3ce64a 100644 (file)
--- a/tools/examples/Makefile
+++ b/tools/examples/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 # Init scripts.

diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile
index 0ce965e7492797f1ed78f8ff17ae2cd51d6cb139..4b6d1441340e2ae13fcf3b4113cc7614bcb5974c 100644 (file)
--- a/tools/firmware/Makefile
+++ b/tools/firmware/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 # hvmloader is a 32-bit protected mode binary.

diff --git a/tools/firmware/etherboot/Makefile b/tools/firmware/etherboot/Makefile
index 8c3a422e6baa164eca4d6e4ef120848b1e77023e..326f9b82640fcae5e83b5998b42bb6497d5c690a 100644 (file)
--- a/tools/firmware/etherboot/Makefile
+++ b/tools/firmware/etherboot/Makefile
@@ -1,6 +1,6 @@
 
 override XEN_TARGET_ARCH = x86_32
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 include Config
 

diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile
index 175465c013406e68dd74fae5f47845933e4a82d0..a18a8c5c0f50029048155378604a7bcd6f6f1eda 100644 (file)
--- a/tools/firmware/hvmloader/Makefile
+++ b/tools/firmware/hvmloader/Makefile
@@ -18,7 +18,7 @@
 # Place - Suite 330, Boston, MA 02111-1307 USA.
 #
 
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/firmware/Rules.mk
 
 SUBDIRS := acpi

diff --git a/tools/firmware/hvmloader/acpi/Makefile b/tools/firmware/hvmloader/acpi/Makefile
index f8ded8938b1df9a4fd52448fc2de824100a66b6a..96117248dfcfc2aca687c9e1e71f859a1d964cec 100644 (file)
--- a/tools/firmware/hvmloader/acpi/Makefile
+++ b/tools/firmware/hvmloader/acpi/Makefile
@@ -15,7 +15,7 @@
 # Place - Suite 330, Boston, MA 02111-1307 USA.
 #
 
-XEN_ROOT = ../../../..
+XEN_ROOT = $(CURDIR)/../../../..
 include $(XEN_ROOT)/tools/firmware/Rules.mk
 
 C_SRC = build.c dsdt_anycpu.c dsdt_15cpu.c static_tables.c

diff --git a/tools/firmware/rombios/32bit/Makefile b/tools/firmware/rombios/32bit/Makefile
index 407faff9563954fb8a953b92933e45b42eace190..92b32367f57c312df98c37d98ccca4e8dca7f6c7 100644 (file)
--- a/tools/firmware/rombios/32bit/Makefile
+++ b/tools/firmware/rombios/32bit/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../../..
+XEN_ROOT = $(CURDIR)/../../../..
 include $(XEN_ROOT)/tools/firmware/Rules.mk
 
 TARGET = 32bitbios_flat.h

diff --git a/tools/firmware/rombios/32bit/tcgbios/Makefile b/tools/firmware/rombios/32bit/tcgbios/Makefile
index 8ce1d77e3520aebd460a154d66b94009164f907a..09c01f7a7b78b6784332ba351e08a4df60058832 100644 (file)
--- a/tools/firmware/rombios/32bit/tcgbios/Makefile
+++ b/tools/firmware/rombios/32bit/tcgbios/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../../../..
+XEN_ROOT = $(CURDIR)/../../../../..
 include $(XEN_ROOT)/tools/firmware/Rules.mk
 
 TARGET  = tcgbiosext.o

diff --git a/tools/firmware/rombios/Makefile b/tools/firmware/rombios/Makefile
index 8321eadd8519bb62b7eeb31875e61b6258b3d751..2f2e4090e72118c799a411d28589a2fca00bfc17 100644 (file)
--- a/tools/firmware/rombios/Makefile
+++ b/tools/firmware/rombios/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 SUBDIRS := 32bit

diff --git a/tools/flask/Makefile b/tools/flask/Makefile
index 08961cf810f4ce9815ed62fca4e856de44f9b65c..a27b2650b3dbf10832a4fcd0c750a5b1f9f479d3 100644 (file)
--- a/tools/flask/Makefile
+++ b/tools/flask/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 SUBDIRS :=

diff --git a/tools/flask/libflask/Makefile b/tools/flask/libflask/Makefile
index 0af2f062132d897811201629869a1b75d2e52a1f..e1f5703762076337e6df12277dd8f80f48922b60 100644 (file)
--- a/tools/flask/libflask/Makefile
+++ b/tools/flask/libflask/Makefile
@@ -1,7 +1,7 @@
 MAJOR    = 1.0
 MINOR    = 0
 
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 XEN_LIBXC = $(XEN_ROOT)/tools/libxc

diff --git a/tools/flask/utils/Makefile b/tools/flask/utils/Makefile
index c7110a45bfa22b4fd0b9b752d3c7267bb9efca7b..85a02291cd61b40b3e9208961a0dc32f6dd91263 100644 (file)
--- a/tools/flask/utils/Makefile
+++ b/tools/flask/utils/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT=../../..
+XEN_ROOT=$(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 XEN_LIBXC          = $(XEN_ROOT)/tools/libxc
 

diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile
index d3662a84550842f4f2143704a2e76e9c744134c0..5401592ae10f317f1f41dc462e11c93a3d6055a2 100644 (file)
--- a/tools/hotplug/Linux/Makefile
+++ b/tools/hotplug/Linux/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 # Init scripts.

diff --git a/tools/hotplug/Makefile b/tools/hotplug/Makefile
index e22cae4fa5fc69367d3df8dc947e269e1dbc3b02..f147b5918ce23e5f3cdae7e972f9753390813c94 100644 (file)
--- a/tools/hotplug/Makefile
+++ b/tools/hotplug/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 SUBDIRS-y := common

diff --git a/tools/hotplug/NetBSD/Makefile b/tools/hotplug/NetBSD/Makefile
index 98c1c5bbd4868aad7ad819dd5438027581636c30..2ae5a34ebce0008290dce6703b89299b84bb44ff 100644 (file)
--- a/tools/hotplug/NetBSD/Makefile
+++ b/tools/hotplug/NetBSD/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 # Xen script dir and scripts to go there.

diff --git a/tools/hotplug/common/Makefile b/tools/hotplug/common/Makefile
index 35fab6daf2a079d268032b1c1212a92052ff5aa7..fe6ae4b466b2c808d5301345497874a7706bdbe4 100644 (file)
--- a/tools/hotplug/common/Makefile
+++ b/tools/hotplug/common/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 HOTPLUGPATH="hotplugpath.sh"

diff --git a/tools/include/Makefile b/tools/include/Makefile
index 62c27170ef840d1ca18b5ea135c793c426f26950..cbff41b93e8e857e0bfe6e71457064618530e0f6 100644 (file)
--- 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 77a535f4d048b9a583bf30e3949fbb55bae553d0..0de9018310936064ef5d7bfa0ec7fb344bc9e25c 100644 (file)
--- 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

diff --git a/tools/libaio/src/Makefile b/tools/libaio/src/Makefile
index dd67529ae70f6e2a3d79d454ef68f7468bb494be..4ec7ab0e6cfde505e749efc3e23562f7b837ac96 100644 (file)
--- a/tools/libaio/src/Makefile
+++ b/tools/libaio/src/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 prefix=$(PREFIX)

diff --git a/tools/libfsimage/Makefile b/tools/libfsimage/Makefile
index d5194fe54d66f1dd2512c94f28c81549a08ecb05..2075a192ab9844022bc6fef7cb1f0737f826d1e6 100644 (file)
--- 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 4f72bb5eeab24520cd81b972cfa98d458d970167..afb1e96e0dcea0ffde34551c1f236fd9174488f0 100644 (file)
--- 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 a60b3a58a559844a2db70190e0a1cf263fa65721..142207f63b07f78725f5f6c1a1b13f4a98ca0e85 100644 (file)
--- 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 43a4501f5da011557af78790e889664d81e484a6..8ff4c71a1c13fecc0ebb51bc7dba4ac360ceef90 100644 (file)
--- 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 bfc55e4f8c25e07ebe7aae6ec63bc2f95038feb8..2911a0e0e7cfb13c4c3ea1d03d284e0ef2d33c32 100644 (file)
--- 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 6e7169490b3b938199eed6350da127bbd5425bb5..4096cafa0c1db76653c5ab284a6785355c9183c3 100644 (file)
--- 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 c71fff884351c67e0975f4bc3bcabc79ad8d329d..57f286b25655340b31b9961647a252c319f19c3b 100644 (file)
--- 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 b7218c2b3f4284abc8e5144e21b90c583a173b26..c1371080f5283e95d040d8c68138b1a17712f45d 100644 (file)
--- 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 1f55def8ce7ccde48a9879e68e99d0d74d6158fd..9fb0aabe78bd5cf293d32c69b779e1d9d50fc563 100644 (file)
--- 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

diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index 5a7677e996d11fd7cda5135353e2dd5605071e97..9942c3ab11d9f2a9e9a75945e1ecd6f23252e5d6 100644 (file)
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 MAJOR    = 4.0

diff --git a/tools/libxc/ia64/Makefile b/tools/libxc/ia64/Makefile
index 6a1d6d00e6d9879f1a4042f5966f7c41d098a6fa..9d4d5ebc77763ba3b39f16f4ede550dc018eec3a 100644 (file)
--- a/tools/libxc/ia64/Makefile
+++ b/tools/libxc/ia64/Makefile
@@ -14,7 +14,7 @@ DOMFW_SRCS_BASE := dom_fw_common.c dom_fw_domu.c dom_fw_asm.S
 endif
 DOMFW_SRCS := $(addprefix ia64/, $(DOMFW_SRCS_BASE))
 $(DOMFW_SRCS):
-       ln -sf ../$(XEN_ROOT)/xen/arch/ia64/xen/$(@F) $@
+       ln -sf $(XEN_ROOT)/xen/arch/ia64/xen/$(@F) $@
 
 # XXX kludge: libxc/Makefile doesn't understand .S.
 GUEST_SRCS-y += $(patsubst %.S, %.c, $(DOMFW_SRCS))
@@ -29,7 +29,7 @@ CFLAGS        += -Iia64
 DOMFW_ASM_HDRS_BASE := bundle.h dom_fw.h dom_fw_common.h dom_fw_domu.h
 DOMFW_ASM_HDRS := $(addprefix ia64/asm/, $(DOMFW_ASM_HDRS_BASE))
 $(DOMFW_ASM_HDRS): ia64/asm
-       ln -sf ../../$(XEN_ROOT)/xen/include/asm-ia64/$(@F) $@
+       ln -sf $(XEN_ROOT)/xen/include/asm-ia64/$(@F) $@
 build: $(DOMFW_ASM_HDR)
 
 .PHONY: mk-symlinks-acpi mk-symlinks-misc ia64-clean
@@ -43,12 +43,12 @@ $(IA64_EMPTY_FILES): $(IA64_HDR_DIRS)
        echo "/* automatically created dummy empty header file. */" > $@
 
 mk-symlinks-acpi: $(IA64_HDR_DIRS) $(IA64_EMPTY_FILES) $(DOMFW_ASM_HDRS)
-       ( cd ia64/acpi && ln -sf ../../$(XEN_ROOT)/xen/include/acpi/*.h .)
-       ( cd ia64/acpi/platform && ln -sf ../../../$(XEN_ROOT)/xen/include/acpi/platform/*.h .)
-       ( cd ia64/xen && ln -sf ../../$(XEN_ROOT)/xen/include/xen/acpi.h .)
+       ( cd ia64/acpi && ln -sf $(XEN_ROOT)/xen/include/acpi/*.h .)
+       ( cd ia64/acpi/platform && ln -sf $(XEN_ROOT)/xen/include/acpi/platform/*.h .)
+       ( cd ia64/xen && ln -sf $(XEN_ROOT)/xen/include/xen/acpi.h .)
 mk-symlinks-misc: $(IA64_HDR_DIRS)
-       ( cd ia64/asm && ln -sf ../../$(XEN_ROOT)/xen/include/asm-ia64/linux-xen/asm/kregs.h .)
-       ( cd ia64/asm && ln -sf ../../$(XEN_ROOT)/xen/include/asm-ia64/linux/asm/fpswa.h .)
+       ( cd ia64/asm && ln -sf $(XEN_ROOT)/xen/include/asm-ia64/linux-xen/asm/kregs.h .)
+       ( cd ia64/asm && ln -sf $(XEN_ROOT)/xen/include/asm-ia64/linux/asm/fpswa.h .)
 build: mk-symlinks-acpi mk-symlinks-misc
 
 clean: ia64-clean

diff --git a/tools/libxen/Makefile b/tools/libxen/Makefile
index d051667588f6548f3e611071cf448ffba084c967..1996b98142dcd5926aaa9c96e2d2bc3fc672c108 100644 (file)
--- a/tools/libxen/Makefile
+++ b/tools/libxen/Makefile
@@ -15,7 +15,7 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 #
-XEN_ROOT=../..
+XEN_ROOT=$(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 MAJOR = 1.0

diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
index a139f54b520b8a5731083666e3ee668095830b67..725d5d1491b5c53957e45096b3764c51cd2311ea 100644 (file)
--- a/tools/libxl/Makefile
+++ b/tools/libxl/Makefile
@@ -2,7 +2,7 @@
 # tools/libxl/Makefile
 #
 
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 MAJOR = 1.0

diff --git a/tools/memshr/Makefile b/tools/memshr/Makefile
index fcf3a4ef22719a17a0c41c26a89b763ee9156b47..d6ed42a87ea75e908628c46b4d3a2b181b77ea01 100644 (file)
--- a/tools/memshr/Makefile
+++ b/tools/memshr/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 LIBMEMSHR-BUILD := libmemshr.a

diff --git a/tools/misc/Makefile b/tools/misc/Makefile
index 89e0ac46a9370a7705fdf4cd890f10e3a4a36f34..e4e8bfe14cdf87c8411fe10cc8c4bed07857d58f 100644 (file)
--- a/tools/misc/Makefile
+++ b/tools/misc/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT=../..
+XEN_ROOT=$(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS   += -Werror

diff --git a/tools/misc/lomount/Makefile b/tools/misc/lomount/Makefile
index 7eafce16e51ce4b6b5ffccef35b718ad1835ed9e..67636a8cb15d17728cdb2a643284649262ef3735 100644 (file)
--- a/tools/misc/lomount/Makefile
+++ b/tools/misc/lomount/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT=../../..
+XEN_ROOT=$(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS  += -Werror

diff --git a/tools/misc/miniterm/Makefile b/tools/misc/miniterm/Makefile
index 116ef1f6b32a6c01938328308c2b6a0ffe0bcae5..5c5f561393e27c5752935d98eaa590bab5795072 100644 (file)
--- a/tools/misc/miniterm/Makefile
+++ b/tools/misc/miniterm/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT:=../../..
+XEN_ROOT:=$(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 TARGET = miniterm

diff --git a/tools/misc/nsplitd/Makefile b/tools/misc/nsplitd/Makefile
index d15bb4d12bd6d3651b9bb8968668cb1ef823110b..91ccf4dab8b85fc1cd35c3a12990ced36e1987a8 100644 (file)
--- a/tools/misc/nsplitd/Makefile
+++ b/tools/misc/nsplitd/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT := ../../..
+XEN_ROOT := $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFILES = $(wildcard *.c)

diff --git a/tools/ocaml/Makefile b/tools/ocaml/Makefile
index 9964631e5129fc596027445c8326b4656e9a6db0..6b22bbe779569aa754377a496243fc86b7bac788 100644 (file)
--- a/tools/ocaml/Makefile
+++ b/tools/ocaml/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 SUBDIRS_PROGRAMS = xenstored

diff --git a/tools/ocaml/libs/Makefile b/tools/ocaml/libs/Makefile
index 2a50a31ef9c1ea4191bce3dac3d683c7e5b22a1d..39705141ebf93634720de5b8339261ff14ac5936 100644 (file)
--- a/tools/ocaml/libs/Makefile
+++ b/tools/ocaml/libs/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 SUBDIRS= \

diff --git a/tools/ocaml/libs/eventchn/Makefile b/tools/ocaml/libs/eventchn/Makefile
index ad017a1a93aa34ef405deedfcf7dc55877ce135f..2d644d9de6bad11b0cd8abcac40ad8e464095e52 100644 (file)
--- a/tools/ocaml/libs/eventchn/Makefile
+++ b/tools/ocaml/libs/eventchn/Makefile
@@ -1,4 +1,4 @@
-TOPLEVEL=../..
+TOPLEVEL=$(CURDIR)/../..
 XEN_ROOT=$(TOPLEVEL)/../..
 include $(TOPLEVEL)/common.make
 

diff --git a/tools/ocaml/libs/log/Makefile b/tools/ocaml/libs/log/Makefile
index f6a26d6c927bca2a50cddb3611bfe4589b465b27..3f35bb0540d20a17c2e57c878e5c50f8b5f0da41 100644 (file)
--- a/tools/ocaml/libs/log/Makefile
+++ b/tools/ocaml/libs/log/Makefile
@@ -1,4 +1,4 @@
-TOPLEVEL=../..
+TOPLEVEL=$(CURDIR)/../..
 XEN_ROOT=$(TOPLEVEL)/../..
 include $(TOPLEVEL)/common.make
 

diff --git a/tools/ocaml/libs/mmap/Makefile b/tools/ocaml/libs/mmap/Makefile
index 6796d93895423353428a31516a3e5181b11e9068..1a790925f16b15f725f0084a555ff30ec318ca14 100644 (file)
--- a/tools/ocaml/libs/mmap/Makefile
+++ b/tools/ocaml/libs/mmap/Makefile
@@ -1,4 +1,4 @@
-TOPLEVEL=../..
+TOPLEVEL=$(CURDIR)/../..
 XEN_ROOT=$(TOPLEVEL)/../..
 include $(TOPLEVEL)/common.make
 

diff --git a/tools/ocaml/libs/uuid/Makefile b/tools/ocaml/libs/uuid/Makefile
index 509dd7c5f58b36e4a9a16a3488fa3321f3dd89e5..d6cd8dbc673ec3f921c31362b9edd5502fa3b378 100644 (file)
--- a/tools/ocaml/libs/uuid/Makefile
+++ b/tools/ocaml/libs/uuid/Makefile
@@ -1,4 +1,4 @@
-TOPLEVEL=../..
+TOPLEVEL=$(CURDIR)/../..
 XEN_ROOT=$(TOPLEVEL)/../..
 include $(TOPLEVEL)/common.make
 

diff --git a/tools/ocaml/libs/xb/Makefile b/tools/ocaml/libs/xb/Makefile
index 7e583ea5d325cf445219ed3a675ef8fde2e4b789..317d879c2c0096f4f5eff93b6b2f3f123ecb9056 100644 (file)
--- a/tools/ocaml/libs/xb/Makefile
+++ b/tools/ocaml/libs/xb/Makefile
@@ -1,4 +1,4 @@
-TOPLEVEL=../..
+TOPLEVEL=$(CURDIR)/../..
 XEN_ROOT=$(TOPLEVEL)/../..
 include $(TOPLEVEL)/common.make
 

diff --git a/tools/ocaml/libs/xc/Makefile b/tools/ocaml/libs/xc/Makefile
index 211ad87f2c7f597a9186f3795115e57d1b04fe99..b53ab74b2f4a6d08e55fd5d7770800eb49ceff25 100644 (file)
--- a/tools/ocaml/libs/xc/Makefile
+++ b/tools/ocaml/libs/xc/Makefile
@@ -1,4 +1,4 @@
-TOPLEVEL=../..
+TOPLEVEL=$(CURDIR)/../..
 XEN_ROOT=$(TOPLEVEL)/../..
 include $(TOPLEVEL)/common.make
 

diff --git a/tools/ocaml/libs/xl/Makefile b/tools/ocaml/libs/xl/Makefile
index f04e7c740d7a6b6f49b81e163b93e6bb2195af6f..1b31fad95424ac65c5325dfe0a3cc8c72b08da49 100644 (file)
--- a/tools/ocaml/libs/xl/Makefile
+++ b/tools/ocaml/libs/xl/Makefile
@@ -1,4 +1,4 @@
-TOPLEVEL=../..
+TOPLEVEL=$(CURDIR)/../..
 XEN_ROOT=$(TOPLEVEL)/../..
 include $(TOPLEVEL)/common.make
 

diff --git a/tools/ocaml/libs/xs/Makefile b/tools/ocaml/libs/xs/Makefile
index 31a9646f23c6fcf35c401d90a303eba6c102c0f6..bc0db8318ae38a116531e05244d04539c08cd710 100644 (file)
--- a/tools/ocaml/libs/xs/Makefile
+++ b/tools/ocaml/libs/xs/Makefile
@@ -1,4 +1,4 @@
-TOPLEVEL=../..
+TOPLEVEL=$(CURDIR)/../..
 XEN_ROOT=$(TOPLEVEL)/../..
 include $(TOPLEVEL)/common.make
 

diff --git a/tools/ocaml/xenstored/Makefile b/tools/ocaml/xenstored/Makefile
index c13d837e67d520ab283fe96755ea6942ab94927a..4e674ab963a61dd56635500e7eb8ac2e0a0dc1f0 100644 (file)
--- a/tools/ocaml/xenstored/Makefile
+++ b/tools/ocaml/xenstored/Makefile
@@ -1,5 +1,5 @@
-XEN_ROOT = ../../..
-OCAML_TOPLEVEL = ..
+XEN_ROOT = $(CURDIR)/../../..
+OCAML_TOPLEVEL = $(CURDIR)/..
 include $(OCAML_TOPLEVEL)/common.make
 
 OCAMLINCLUDE += \

diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
index 49abed06d138dc4c153429241cb6d67f940e504e..1d6e659e63dd0989395e4a2e8b1e03188439dc28 100644 (file)
--- a/tools/pygrub/Makefile
+++ b/tools/pygrub/Makefile
@@ -1,5 +1,5 @@
 
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 .PHONY: all

diff --git a/tools/python/Makefile b/tools/python/Makefile
index ee7e62564c1a0129ac6aa0270c739e5a25e7fe94..eb7d7f0bd18bebfd38273e6dbd52104ffba1153b 100644 (file)
--- a/tools/python/Makefile
+++ b/tools/python/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 .PHONY: all

diff --git a/tools/remus/Makefile b/tools/remus/Makefile
index 59514829dcffe8d827688cce357d6a9d5084b72b..ae823769c61e0bf8c7e50405c211090a0d9dd28f 100644 (file)
--- a/tools/remus/Makefile
+++ b/tools/remus/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT=../..
+XEN_ROOT=$(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 SCRIPTS = remus

diff --git a/tools/security/Makefile b/tools/security/Makefile
index 4931637435758d52b0559745bbd21ea64df32e04..605bc8864a4bd6e885c2248d297901f471f86664 100644 (file)
--- a/tools/security/Makefile
+++ b/tools/security/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS   += -Werror

diff --git a/tools/tests/mce-test/tools/Makefile b/tools/tests/mce-test/tools/Makefile
index c3e05136443710a682c86bc122ce1e39dc50ca1a..43e39ad1f40104bd6133afc4886c602f0083b142 100644 (file)
--- a/tools/tests/mce-test/tools/Makefile
+++ b/tools/tests/mce-test/tools/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT=../../../..
+XEN_ROOT=$(CURDIR)/../../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS   += -Werror

diff --git a/tools/tests/x86_emulator/Makefile b/tools/tests/x86_emulator/Makefile
index d0bbe0ee83d8de0e45fe9ec61a0e682f56437058..9c9739f329907fa84b3bd360ddf4d37c3a8d4419 100644 (file)
--- a/tools/tests/x86_emulator/Makefile
+++ b/tools/tests/x86_emulator/Makefile
@@ -1,5 +1,5 @@
 
-XEN_ROOT=../../..
+XEN_ROOT=$(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 TARGET := test_x86_emulator

diff --git a/tools/tests/x86_emulator/blowfish.mk b/tools/tests/x86_emulator/blowfish.mk
index 85da259a5c45d1ed19e956232a6ebe3bc92e4683..7202873a96d62d88bce339652fdd0deaad7d95d9 100644 (file)
--- a/tools/tests/x86_emulator/blowfish.mk
+++ b/tools/tests/x86_emulator/blowfish.mk
@@ -1,5 +1,5 @@
 
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 CFLAGS =
 include $(XEN_ROOT)/tools/Rules.mk
 

diff --git a/tools/tests/xen-access/Makefile b/tools/tests/xen-access/Makefile
index 1a7e0369fb43c7eaa3dd9a61eb0fa643fef0eae4..aed89122852b5361599dda0c9e012aff64fb138c 100644 (file)
--- a/tools/tests/xen-access/Makefile
+++ b/tools/tests/xen-access/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT=../../..
+XEN_ROOT=$(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS   += -Werror

diff --git a/tools/vnet/doc/Makefile b/tools/vnet/doc/Makefile
index a234721b5111da6202b21d225fee2b2416612415..53f2bbff61c0e3a6b880316ff78f7270781cdfec 100644 (file)
--- a/tools/vnet/doc/Makefile
+++ b/tools/vnet/doc/Makefile
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 # -*- mode: Makefile; -*-
-XEN_ROOT        = ../../..
+XEN_ROOT        = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 VERSION = 1.0

diff --git a/tools/vnet/examples/Makefile b/tools/vnet/examples/Makefile
index 84d3f1e09330beadeda5340b11a5cabec5ad2e6b..786fcb7adcd1c68d45498be63503f21ab08c4016 100644 (file)
--- a/tools/vnet/examples/Makefile
+++ b/tools/vnet/examples/Makefile
@@ -1,6 +1,6 @@
 # -*- mode: Makefile; -*-
 #============================================================================
-XEN_ROOT        = ../../..
+XEN_ROOT        = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 .PHONY: all

diff --git a/tools/vnet/scripts/Makefile b/tools/vnet/scripts/Makefile
index 22910a4432a13a3f3f323fa9e39a2e1fc967d850..2717f9e64e9f1238e59f024b55411d92163a05b5 100644 (file)
--- a/tools/vnet/scripts/Makefile
+++ b/tools/vnet/scripts/Makefile
@@ -1,6 +1,6 @@
 # -*- mode: Makefile; -*-
 #============================================================================
-XEN_ROOT        = ../../..
+XEN_ROOT        = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 .PHONY: all

diff --git a/tools/vtpm/Makefile b/tools/vtpm/Makefile
index 10f68360e96698fb14788998576678123e8607d4..653505ac4b390592709194578879aa21c051afe0 100644 (file)
--- a/tools/vtpm/Makefile
+++ b/tools/vtpm/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 
 # Base definitions and rules
 include $(XEN_ROOT)/tools/vtpm/Rules.mk

diff --git a/tools/vtpm_manager/Makefile b/tools/vtpm_manager/Makefile
index dc90eb89929d5860e3a4cf98f0bd2fb6af1b8866..632f41bce37d9830bb7cefd52227d050cfa2d0e0 100644 (file)
--- a/tools/vtpm_manager/Makefile
+++ b/tools/vtpm_manager/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 
 # Base definitions and rules
 include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk

diff --git a/tools/vtpm_manager/crypto/Makefile b/tools/vtpm_manager/crypto/Makefile
index 63233a940eebe61e4b2bfbd6ff8d0af3c8480e10..13b61c984aa5549b66413914b2baf126ac756f2a 100644 (file)
--- a/tools/vtpm_manager/crypto/Makefile
+++ b/tools/vtpm_manager/crypto/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk
 
 BIN            = libtcpaCrypto.a

diff --git a/tools/vtpm_manager/manager/Makefile b/tools/vtpm_manager/manager/Makefile
index f9c34f9b0cadcb6cf62985df348f85bc22df2e56..82da1068f888895094217f62887ad22246ecfcf7 100644 (file)
--- a/tools/vtpm_manager/manager/Makefile
+++ b/tools/vtpm_manager/manager/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk
 
 BIN            = vtpm_managerd

diff --git a/tools/vtpm_manager/migration/Makefile b/tools/vtpm_manager/migration/Makefile
index 938fdf85f75abb657147e044b703423c6814f513..cc6aee8f10ae4d33e48653aec23ef3b22f2773c9 100644 (file)
--- a/tools/vtpm_manager/migration/Makefile
+++ b/tools/vtpm_manager/migration/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk
 
 VPATH = ../manager

diff --git a/tools/vtpm_manager/tcs/Makefile b/tools/vtpm_manager/tcs/Makefile
index 9d25817e63452235c5cea6b9822b773a20b565d5..11af91e9ad83f766152caf3dc019d17d335f7f48 100644 (file)
--- a/tools/vtpm_manager/tcs/Makefile
+++ b/tools/vtpm_manager/tcs/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk
 
 BIN            = libTCS.a

diff --git a/tools/vtpm_manager/util/Makefile b/tools/vtpm_manager/util/Makefile
index 9e26c5df1507f76d7ab90c16777a0445905c2dfc..36bc38f63fdfc0f7e1374698073045fa8f356747 100644 (file)
--- a/tools/vtpm_manager/util/Makefile
+++ b/tools/vtpm_manager/util/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk
 
 BIN            = libTCGUtils.a

diff --git a/tools/xcutils/Makefile b/tools/xcutils/Makefile
index c779d128c658aa1d521dd3d0095dcbd019585344..5872d57d8c4a2a6d4da8004d3af4b27a647b5331 100644 (file)
--- a/tools/xcutils/Makefile
+++ b/tools/xcutils/Makefile
@@ -8,7 +8,7 @@
 # Copyright (C) 2005 by Christian Limpach
 #
 
-XEN_ROOT       = ../..
+XEN_ROOT       = $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS += -Werror

diff --git a/tools/xenbackendd/Makefile b/tools/xenbackendd/Makefile
index c36a551698ea81f2a0e37669ad16c9f7a27df071..4950134d7d2fe3259af30337c2c506167ec2f161 100644 (file)
--- a/tools/xenbackendd/Makefile
+++ b/tools/xenbackendd/Makefile
@@ -9,7 +9,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-XEN_ROOT=../..
+XEN_ROOT=$(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS  += -Werror

diff --git a/tools/xenmon/Makefile b/tools/xenmon/Makefile
index 64ba03033c8be61972f2734147bf2bd67640f0e7..bde12f2788e28c01239d612bb03322de356ac06a 100644 (file)
--- a/tools/xenmon/Makefile
+++ b/tools/xenmon/Makefile
@@ -10,7 +10,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-XEN_ROOT=../..
+XEN_ROOT=$(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS  += -Werror

diff --git a/tools/xenpaging/Makefile b/tools/xenpaging/Makefile
index 1d94710abb46bf61b32e8d9c10103d3f011c6ce5..ab886f53a70aeb3d938d557e2652e347435201dc 100644 (file)
--- a/tools/xenpaging/Makefile
+++ b/tools/xenpaging/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT=../..
+XEN_ROOT=$(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS   += -I $(XEN_XC)

diff --git a/tools/xenpmd/Makefile b/tools/xenpmd/Makefile
index 101757d6616fde551ec67395685a503d9214872a..2a9249cb966788c3428f7d9c21b4777499467efb 100644 (file)
--- a/tools/xenpmd/Makefile
+++ b/tools/xenpmd/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT=../..
+XEN_ROOT=$(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS  += -Werror

diff --git a/tools/xenstat/Makefile b/tools/xenstat/Makefile
index c12e0a49de677aa0960bc3fadbf3a849bdcdf06e..904ccdde7159beb5803d3ad99832cdae4caad55b 100644 (file)
--- a/tools/xenstat/Makefile
+++ b/tools/xenstat/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 SUBDIRS :=

diff --git a/tools/xenstat/libxenstat/Makefile b/tools/xenstat/libxenstat/Makefile
index 1a08d0597c6953d3e58789581ba681c744a4e837..618480ad1a1cef8ea474ae89fa0df0f21258bd8a 100644 (file)
--- a/tools/xenstat/libxenstat/Makefile
+++ b/tools/xenstat/libxenstat/Makefile
@@ -12,7 +12,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
 
-XEN_ROOT=../../..
+XEN_ROOT=$(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 prefix=$(PREFIX)

diff --git a/tools/xenstat/xentop/Makefile b/tools/xenstat/xentop/Makefile
index 15daa39c598d48a94471e5c082f4e321bd8041a0..d31ba0606696d906e4288af5c03a3e96d5273cfc 100644 (file)
--- a/tools/xenstat/xentop/Makefile
+++ b/tools/xenstat/xentop/Makefile
@@ -10,7 +10,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-XEN_ROOT=../../..
+XEN_ROOT=$(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 ifneq ($(XENSTAT_XENTOP),y)

diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index 35e68d05331d92a672adf18e0ba0fca4c3273d91..788401d555026e4f60b7d7df0f76eaec92407020 100644 (file)
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT=../..
+XEN_ROOT=$(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 MAJOR = 3.0

diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile
index 25dda4984aec9d874d6e5bc04aa2371d3f0e17ea..46b18794ecc4b578d126494753921523286a5346 100644 (file)
--- a/tools/xentrace/Makefile
+++ b/tools/xentrace/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT=../..
+XEN_ROOT=$(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS  += -Werror