[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-changelog] [xen-unstable] build: Make XEN_ROOT an absolute path.



# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1300358185 0
# Node ID ff3b7749008b6b3293d88c7f979e8e24d13c45fa
# Parent  5069eaaa9f7981a3974cb1f73ec296d8f6affc20
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@xxxxxxx>
---


diff -r 5069eaaa9f79 -r ff3b7749008b Config.mk
--- a/Config.mk Thu Mar 17 08:04:10 2011 +0000
+++ b/Config.mk Thu Mar 17 10:36:25 2011 +0000
@@ -102,27 +102,10 @@
     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 -r 5069eaaa9f79 -r ff3b7749008b docs/Makefile
--- a/docs/Makefile     Thu Mar 17 08:04:10 2011 +0000
+++ b/docs/Makefile     Thu Mar 17 10:36:25 2011 +0000
@@ -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 -r 5069eaaa9f79 -r ff3b7749008b docs/xen-api/Makefile
--- a/docs/xen-api/Makefile     Thu Mar 17 08:04:10 2011 +0000
+++ b/docs/xen-api/Makefile     Thu Mar 17 10:36:25 2011 +0000
@@ -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 -r 5069eaaa9f79 -r ff3b7749008b extras/mini-os/Config.mk
--- a/extras/mini-os/Config.mk  Thu Mar 17 08:04:10 2011 +0000
+++ b/extras/mini-os/Config.mk  Thu Mar 17 10:36:25 2011 +0000
@@ -38,15 +38,15 @@
 # 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 -r 5069eaaa9f79 -r ff3b7749008b extras/mini-os/Makefile
--- a/extras/mini-os/Makefile   Thu Mar 17 08:04:10 2011 +0000
+++ b/extras/mini-os/Makefile   Thu Mar 17 10:36:25 2011 +0000
@@ -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 -r 5069eaaa9f79 -r ff3b7749008b extras/mini-os/arch/ia64/Makefile
--- a/extras/mini-os/arch/ia64/Makefile Thu Mar 17 08:04:10 2011 +0000
+++ b/extras/mini-os/arch/ia64/Makefile Thu Mar 17 10:36:25 2011 +0000
@@ -2,7 +2,7 @@
 # Special makefile for ia64.
 #
 
-XEN_ROOT = ../../../..
+XEN_ROOT = $(CURDIR)/../../../..
 include $(XEN_ROOT)/Config.mk
 
 include ../../Config.mk
diff -r 5069eaaa9f79 -r ff3b7749008b extras/mini-os/arch/x86/Makefile
--- a/extras/mini-os/arch/x86/Makefile  Thu Mar 17 08:04:10 2011 +0000
+++ b/extras/mini-os/arch/x86/Makefile  Thu Mar 17 10:36:25 2011 +0000
@@ -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 -r 5069eaaa9f79 -r ff3b7749008b stubdom/Makefile
--- a/stubdom/Makefile  Thu Mar 17 08:04:10 2011 +0000
+++ b/stubdom/Makefile  Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ..
+XEN_ROOT = $(CURDIR)/..
 MINI_OS = $(XEN_ROOT)/extras/mini-os
 
 export XEN_OS=MiniOS
@@ -64,7 +64,7 @@
 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 @@
 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 @@
 
 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 @@
 .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 -r 5069eaaa9f79 -r ff3b7749008b stubdom/c/Makefile
--- a/stubdom/c/Makefile        Thu Mar 17 08:04:10 2011 +0000
+++ b/stubdom/c/Makefile        Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 
 include $(XEN_ROOT)/Config.mk
 
diff -r 5069eaaa9f79 -r ff3b7749008b stubdom/caml/Makefile
--- a/stubdom/caml/Makefile     Thu Mar 17 08:04:10 2011 +0000
+++ b/stubdom/caml/Makefile     Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 
 include $(XEN_ROOT)/Config.mk
 
diff -r 5069eaaa9f79 -r ff3b7749008b stubdom/grub/Makefile
--- a/stubdom/grub/Makefile     Thu Mar 17 08:04:10 2011 +0000
+++ b/stubdom/grub/Makefile     Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 
 include $(XEN_ROOT)/Config.mk
 vpath %.c ../grub-upstream
diff -r 5069eaaa9f79 -r ff3b7749008b stubdom/pciutils.patch
--- a/stubdom/pciutils.patch    Thu Mar 17 08:04:10 2011 +0000
+++ b/stubdom/pciutils.patch    Thu Mar 17 10:36:25 2011 +0000
@@ -38,7 +38,7 @@
  endif
  
 +ifdef PCI_OS_MINIOS
-+XEN_ROOT=../../..
++XEN_ROOT=$(CURDIR)/../../..
 +include $(XEN_ROOT)/Config.mk
 +OBJS += minios.o
 +endif
diff -r 5069eaaa9f79 -r ff3b7749008b tools/Makefile
--- a/tools/Makefile    Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/Makefile    Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ..
+XEN_ROOT = $(CURDIR)/..
 include $(XEN_ROOT)/tools/Rules.mk
 
 SUBDIRS-y :=
@@ -105,7 +105,6 @@
                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-clean-ioemu-dir:
        set -e; if test -d ioemu-dir/.; then \
-               $(absolutify_xen_root); \
                $(buildmakevars2shellvars); \
                $(MAKE) -C ioemu-dir clean; \
        fi
diff -r 5069eaaa9f79 -r ff3b7749008b tools/blktap/Makefile
--- a/tools/blktap/Makefile     Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/blktap/Makefile     Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 SUBDIRS-y :=
diff -r 5069eaaa9f79 -r ff3b7749008b tools/blktap/drivers/Makefile
--- a/tools/blktap/drivers/Makefile     Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/blktap/drivers/Makefile     Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 IBIN         = blktapctrl tapdisk
diff -r 5069eaaa9f79 -r ff3b7749008b tools/blktap/lib/Makefile
--- a/tools/blktap/lib/Makefile Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/blktap/lib/Makefile Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 MAJOR    = 3.0
diff -r 5069eaaa9f79 -r ff3b7749008b tools/blktap2/Makefile
--- a/tools/blktap2/Makefile    Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/blktap2/Makefile    Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS  += $(CFLAGS_libxenctrl)
diff -r 5069eaaa9f79 -r ff3b7749008b tools/blktap2/control/Makefile
--- a/tools/blktap2/control/Makefile    Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/blktap2/control/Makefile    Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT := ../../../
+XEN_ROOT := $(CURDIR)/../../../
 include $(XEN_ROOT)/tools/Rules.mk
 
 MAJOR              = 1.0
diff -r 5069eaaa9f79 -r ff3b7749008b tools/blktap2/drivers/Makefile
--- a/tools/blktap2/drivers/Makefile    Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/blktap2/drivers/Makefile    Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT=../../..
+XEN_ROOT=$(CURDIR)/../../..
 BLKTAP_ROOT= ..
 include $(XEN_ROOT)/tools/Rules.mk
 
diff -r 5069eaaa9f79 -r ff3b7749008b tools/blktap2/include/Makefile
--- a/tools/blktap2/include/Makefile    Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/blktap2/include/Makefile    Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT := ../../..
+XEN_ROOT := $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 .PHONY: all
diff -r 5069eaaa9f79 -r ff3b7749008b tools/blktap2/lvm/Makefile
--- a/tools/blktap2/lvm/Makefile        Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/blktap2/lvm/Makefile        Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 BLKTAP_ROOT := ..
 include $(XEN_ROOT)/tools/Rules.mk
 
diff -r 5069eaaa9f79 -r ff3b7749008b tools/blktap2/vhd/Makefile
--- a/tools/blktap2/vhd/Makefile        Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/blktap2/vhd/Makefile        Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT=../../..
+XEN_ROOT=$(CURDIR)/../../..
 BLKTAP_ROOT := ..
 include $(XEN_ROOT)/tools/Rules.mk
 
diff -r 5069eaaa9f79 -r ff3b7749008b tools/blktap2/vhd/lib/Makefile
--- a/tools/blktap2/vhd/lib/Makefile    Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/blktap2/vhd/lib/Makefile    Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT=../../../..
+XEN_ROOT=$(CURDIR)/../../../..
 BLKTAP_ROOT := ../..
 include $(XEN_ROOT)/tools/Rules.mk
 
diff -r 5069eaaa9f79 -r ff3b7749008b tools/check/Makefile
--- a/tools/check/Makefile      Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/check/Makefile      Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 .PHONY: all install
diff -r 5069eaaa9f79 -r ff3b7749008b tools/console/Makefile
--- a/tools/console/Makefile    Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/console/Makefile    Thu Mar 17 10:36:25 2011 +0000
@@ -1,5 +1,5 @@
 
-XEN_ROOT=../..
+XEN_ROOT=$(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS  += -Werror
diff -r 5069eaaa9f79 -r ff3b7749008b tools/console/testsuite/Makefile
--- a/tools/console/testsuite/Makefile  Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/console/testsuite/Makefile  Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 LDFLAGS=-static
diff -r 5069eaaa9f79 -r ff3b7749008b tools/debugger/gdbsx/Makefile
--- a/tools/debugger/gdbsx/Makefile     Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/debugger/gdbsx/Makefile     Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 include ./Rules.mk
 
 .PHONY: all
diff -r 5069eaaa9f79 -r ff3b7749008b tools/debugger/gdbsx/gx/Makefile
--- a/tools/debugger/gdbsx/gx/Makefile  Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/debugger/gdbsx/gx/Makefile  Thu Mar 17 10:36:25 2011 +0000
@@ -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 -r 5069eaaa9f79 -r ff3b7749008b tools/debugger/gdbsx/xg/Makefile
--- a/tools/debugger/gdbsx/xg/Makefile  Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/debugger/gdbsx/xg/Makefile  Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../../..
+XEN_ROOT = $(CURDIR)/../../../..
 include ../Rules.mk
 
 XG_HDRS := xg_public.h 
diff -r 5069eaaa9f79 -r ff3b7749008b tools/debugger/kdd/Makefile
--- a/tools/debugger/kdd/Makefile       Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/debugger/kdd/Makefile       Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS  += $(CFLAGS_libxenctrl)
diff -r 5069eaaa9f79 -r ff3b7749008b tools/debugger/xenitp/Makefile
--- a/tools/debugger/xenitp/Makefile    Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/debugger/xenitp/Makefile    Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT=../../..
+XEN_ROOT=$(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 #CFLAGS  += -Werror -g -O0
diff -r 5069eaaa9f79 -r ff3b7749008b tools/examples/Makefile
--- a/tools/examples/Makefile   Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/examples/Makefile   Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 # Init scripts.
diff -r 5069eaaa9f79 -r ff3b7749008b tools/firmware/Makefile
--- a/tools/firmware/Makefile   Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/firmware/Makefile   Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 # hvmloader is a 32-bit protected mode binary.
diff -r 5069eaaa9f79 -r ff3b7749008b tools/firmware/etherboot/Makefile
--- a/tools/firmware/etherboot/Makefile Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/firmware/etherboot/Makefile Thu Mar 17 10:36:25 2011 +0000
@@ -1,6 +1,6 @@
 
 override XEN_TARGET_ARCH = x86_32
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 include Config
 
diff -r 5069eaaa9f79 -r ff3b7749008b tools/firmware/hvmloader/Makefile
--- a/tools/firmware/hvmloader/Makefile Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/firmware/hvmloader/Makefile Thu Mar 17 10:36:25 2011 +0000
@@ -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 -r 5069eaaa9f79 -r ff3b7749008b tools/firmware/hvmloader/acpi/Makefile
--- a/tools/firmware/hvmloader/acpi/Makefile    Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/firmware/hvmloader/acpi/Makefile    Thu Mar 17 10:36:25 2011 +0000
@@ -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 -r 5069eaaa9f79 -r ff3b7749008b tools/firmware/rombios/32bit/Makefile
--- a/tools/firmware/rombios/32bit/Makefile     Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/firmware/rombios/32bit/Makefile     Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../../..
+XEN_ROOT = $(CURDIR)/../../../..
 include $(XEN_ROOT)/tools/firmware/Rules.mk
 
 TARGET = 32bitbios_flat.h
diff -r 5069eaaa9f79 -r ff3b7749008b 
tools/firmware/rombios/32bit/tcgbios/Makefile
--- a/tools/firmware/rombios/32bit/tcgbios/Makefile     Thu Mar 17 08:04:10 
2011 +0000
+++ b/tools/firmware/rombios/32bit/tcgbios/Makefile     Thu Mar 17 10:36:25 
2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../../../..
+XEN_ROOT = $(CURDIR)/../../../../..
 include $(XEN_ROOT)/tools/firmware/Rules.mk
 
 TARGET  = tcgbiosext.o
diff -r 5069eaaa9f79 -r ff3b7749008b tools/firmware/rombios/Makefile
--- a/tools/firmware/rombios/Makefile   Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/firmware/rombios/Makefile   Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 SUBDIRS := 32bit
diff -r 5069eaaa9f79 -r ff3b7749008b tools/flask/Makefile
--- a/tools/flask/Makefile      Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/flask/Makefile      Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 SUBDIRS :=
diff -r 5069eaaa9f79 -r ff3b7749008b tools/flask/libflask/Makefile
--- a/tools/flask/libflask/Makefile     Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/flask/libflask/Makefile     Thu Mar 17 10:36:25 2011 +0000
@@ -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 -r 5069eaaa9f79 -r ff3b7749008b tools/flask/utils/Makefile
--- a/tools/flask/utils/Makefile        Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/flask/utils/Makefile        Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT=../../..
+XEN_ROOT=$(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 XEN_LIBXC          = $(XEN_ROOT)/tools/libxc
 
diff -r 5069eaaa9f79 -r ff3b7749008b tools/hotplug/Linux/Makefile
--- a/tools/hotplug/Linux/Makefile      Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/hotplug/Linux/Makefile      Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 # Init scripts.
diff -r 5069eaaa9f79 -r ff3b7749008b tools/hotplug/Makefile
--- a/tools/hotplug/Makefile    Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/hotplug/Makefile    Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 SUBDIRS-y := common
diff -r 5069eaaa9f79 -r ff3b7749008b tools/hotplug/NetBSD/Makefile
--- a/tools/hotplug/NetBSD/Makefile     Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/hotplug/NetBSD/Makefile     Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 # Xen script dir and scripts to go there.
diff -r 5069eaaa9f79 -r ff3b7749008b tools/hotplug/common/Makefile
--- a/tools/hotplug/common/Makefile     Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/hotplug/common/Makefile     Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 HOTPLUGPATH="hotplugpath.sh"
diff -r 5069eaaa9f79 -r ff3b7749008b tools/include/Makefile
--- a/tools/include/Makefile    Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/include/Makefile    Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 .PHONY: all
@@ -11,11 +11,11 @@
 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 -r 5069eaaa9f79 -r ff3b7749008b tools/include/xen-foreign/Makefile
--- a/tools/include/xen-foreign/Makefile        Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/include/xen-foreign/Makefile        Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT=../../..
+XEN_ROOT=$(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 ROOT = $(XEN_ROOT)/xen/include/public
diff -r 5069eaaa9f79 -r ff3b7749008b tools/libaio/src/Makefile
--- a/tools/libaio/src/Makefile Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/libaio/src/Makefile Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 prefix=$(PREFIX)
diff -r 5069eaaa9f79 -r ff3b7749008b tools/libfsimage/Makefile
--- a/tools/libfsimage/Makefile Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/libfsimage/Makefile Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 SUBDIRS-y = common ufs reiserfs iso9660 fat zfs
diff -r 5069eaaa9f79 -r ff3b7749008b tools/libfsimage/common/Makefile
--- a/tools/libfsimage/common/Makefile  Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/libfsimage/common/Makefile  Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 MAJOR = 1.0
diff -r 5069eaaa9f79 -r ff3b7749008b tools/libfsimage/ext2fs-lib/Makefile
--- a/tools/libfsimage/ext2fs-lib/Makefile      Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/libfsimage/ext2fs-lib/Makefile      Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 
 LIB_SRCS-y = ext2fs-lib.c
 
diff -r 5069eaaa9f79 -r ff3b7749008b tools/libfsimage/ext2fs/Makefile
--- a/tools/libfsimage/ext2fs/Makefile  Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/libfsimage/ext2fs/Makefile  Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 
 LIB_SRCS-y = fsys_ext2fs.c
 
diff -r 5069eaaa9f79 -r ff3b7749008b tools/libfsimage/fat/Makefile
--- a/tools/libfsimage/fat/Makefile     Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/libfsimage/fat/Makefile     Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 
 LIB_SRCS-y = fsys_fat.c
 
diff -r 5069eaaa9f79 -r ff3b7749008b tools/libfsimage/iso9660/Makefile
--- a/tools/libfsimage/iso9660/Makefile Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/libfsimage/iso9660/Makefile Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 
 LIB_SRCS-y = fsys_iso9660.c
 
diff -r 5069eaaa9f79 -r ff3b7749008b tools/libfsimage/reiserfs/Makefile
--- a/tools/libfsimage/reiserfs/Makefile        Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/libfsimage/reiserfs/Makefile        Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 
 LIB_SRCS-y = fsys_reiserfs.c
 
diff -r 5069eaaa9f79 -r ff3b7749008b tools/libfsimage/ufs/Makefile
--- a/tools/libfsimage/ufs/Makefile     Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/libfsimage/ufs/Makefile     Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 
 LIB_SRCS-y = fsys_ufs.c
 
diff -r 5069eaaa9f79 -r ff3b7749008b tools/libfsimage/zfs/Makefile
--- a/tools/libfsimage/zfs/Makefile     Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/libfsimage/zfs/Makefile     Thu Mar 17 10:36:25 2011 +0000
@@ -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 -r 5069eaaa9f79 -r ff3b7749008b tools/libxc/Makefile
--- a/tools/libxc/Makefile      Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/libxc/Makefile      Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 MAJOR    = 4.0
diff -r 5069eaaa9f79 -r ff3b7749008b tools/libxc/ia64/Makefile
--- a/tools/libxc/ia64/Makefile Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/libxc/ia64/Makefile Thu Mar 17 10:36:25 2011 +0000
@@ -14,7 +14,7 @@
 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 @@
 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 @@
        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 -r 5069eaaa9f79 -r ff3b7749008b tools/libxen/Makefile
--- a/tools/libxen/Makefile     Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/libxen/Makefile     Thu Mar 17 10:36:25 2011 +0000
@@ -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 -r 5069eaaa9f79 -r ff3b7749008b tools/libxl/Makefile
--- a/tools/libxl/Makefile      Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/libxl/Makefile      Thu Mar 17 10:36:25 2011 +0000
@@ -2,7 +2,7 @@
 # tools/libxl/Makefile
 #
 
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 MAJOR = 1.0
diff -r 5069eaaa9f79 -r ff3b7749008b tools/memshr/Makefile
--- a/tools/memshr/Makefile     Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/memshr/Makefile     Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 LIBMEMSHR-BUILD := libmemshr.a
diff -r 5069eaaa9f79 -r ff3b7749008b tools/misc/Makefile
--- a/tools/misc/Makefile       Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/misc/Makefile       Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT=../..
+XEN_ROOT=$(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS   += -Werror
diff -r 5069eaaa9f79 -r ff3b7749008b tools/misc/lomount/Makefile
--- a/tools/misc/lomount/Makefile       Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/misc/lomount/Makefile       Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT=../../..
+XEN_ROOT=$(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS  += -Werror
diff -r 5069eaaa9f79 -r ff3b7749008b tools/misc/miniterm/Makefile
--- a/tools/misc/miniterm/Makefile      Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/misc/miniterm/Makefile      Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT:=../../..
+XEN_ROOT:=$(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 TARGET = miniterm
diff -r 5069eaaa9f79 -r ff3b7749008b tools/misc/nsplitd/Makefile
--- a/tools/misc/nsplitd/Makefile       Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/misc/nsplitd/Makefile       Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT := ../../..
+XEN_ROOT := $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFILES = $(wildcard *.c)
diff -r 5069eaaa9f79 -r ff3b7749008b tools/ocaml/Makefile
--- a/tools/ocaml/Makefile      Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/ocaml/Makefile      Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 SUBDIRS_PROGRAMS = xenstored
diff -r 5069eaaa9f79 -r ff3b7749008b tools/ocaml/libs/Makefile
--- a/tools/ocaml/libs/Makefile Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/ocaml/libs/Makefile Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 SUBDIRS= \
diff -r 5069eaaa9f79 -r ff3b7749008b tools/ocaml/libs/eventchn/Makefile
--- a/tools/ocaml/libs/eventchn/Makefile        Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/ocaml/libs/eventchn/Makefile        Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-TOPLEVEL=../..
+TOPLEVEL=$(CURDIR)/../..
 XEN_ROOT=$(TOPLEVEL)/../..
 include $(TOPLEVEL)/common.make
 
diff -r 5069eaaa9f79 -r ff3b7749008b tools/ocaml/libs/log/Makefile
--- a/tools/ocaml/libs/log/Makefile     Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/ocaml/libs/log/Makefile     Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-TOPLEVEL=../..
+TOPLEVEL=$(CURDIR)/../..
 XEN_ROOT=$(TOPLEVEL)/../..
 include $(TOPLEVEL)/common.make
 
diff -r 5069eaaa9f79 -r ff3b7749008b tools/ocaml/libs/mmap/Makefile
--- a/tools/ocaml/libs/mmap/Makefile    Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/ocaml/libs/mmap/Makefile    Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-TOPLEVEL=../..
+TOPLEVEL=$(CURDIR)/../..
 XEN_ROOT=$(TOPLEVEL)/../..
 include $(TOPLEVEL)/common.make
 
diff -r 5069eaaa9f79 -r ff3b7749008b tools/ocaml/libs/uuid/Makefile
--- a/tools/ocaml/libs/uuid/Makefile    Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/ocaml/libs/uuid/Makefile    Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-TOPLEVEL=../..
+TOPLEVEL=$(CURDIR)/../..
 XEN_ROOT=$(TOPLEVEL)/../..
 include $(TOPLEVEL)/common.make
 
diff -r 5069eaaa9f79 -r ff3b7749008b tools/ocaml/libs/xb/Makefile
--- a/tools/ocaml/libs/xb/Makefile      Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/ocaml/libs/xb/Makefile      Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-TOPLEVEL=../..
+TOPLEVEL=$(CURDIR)/../..
 XEN_ROOT=$(TOPLEVEL)/../..
 include $(TOPLEVEL)/common.make
 
diff -r 5069eaaa9f79 -r ff3b7749008b tools/ocaml/libs/xc/Makefile
--- a/tools/ocaml/libs/xc/Makefile      Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/ocaml/libs/xc/Makefile      Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-TOPLEVEL=../..
+TOPLEVEL=$(CURDIR)/../..
 XEN_ROOT=$(TOPLEVEL)/../..
 include $(TOPLEVEL)/common.make
 
diff -r 5069eaaa9f79 -r ff3b7749008b tools/ocaml/libs/xl/Makefile
--- a/tools/ocaml/libs/xl/Makefile      Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/ocaml/libs/xl/Makefile      Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-TOPLEVEL=../..
+TOPLEVEL=$(CURDIR)/../..
 XEN_ROOT=$(TOPLEVEL)/../..
 include $(TOPLEVEL)/common.make
 
diff -r 5069eaaa9f79 -r ff3b7749008b tools/ocaml/libs/xs/Makefile
--- a/tools/ocaml/libs/xs/Makefile      Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/ocaml/libs/xs/Makefile      Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-TOPLEVEL=../..
+TOPLEVEL=$(CURDIR)/../..
 XEN_ROOT=$(TOPLEVEL)/../..
 include $(TOPLEVEL)/common.make
 
diff -r 5069eaaa9f79 -r ff3b7749008b tools/ocaml/xenstored/Makefile
--- a/tools/ocaml/xenstored/Makefile    Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/ocaml/xenstored/Makefile    Thu Mar 17 10:36:25 2011 +0000
@@ -1,5 +1,5 @@
-XEN_ROOT = ../../..
-OCAML_TOPLEVEL = ..
+XEN_ROOT = $(CURDIR)/../../..
+OCAML_TOPLEVEL = $(CURDIR)/..
 include $(OCAML_TOPLEVEL)/common.make
 
 OCAMLINCLUDE += \
diff -r 5069eaaa9f79 -r ff3b7749008b tools/pygrub/Makefile
--- a/tools/pygrub/Makefile     Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/pygrub/Makefile     Thu Mar 17 10:36:25 2011 +0000
@@ -1,5 +1,5 @@
 
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 .PHONY: all
diff -r 5069eaaa9f79 -r ff3b7749008b tools/python/Makefile
--- a/tools/python/Makefile     Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/python/Makefile     Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 .PHONY: all
diff -r 5069eaaa9f79 -r ff3b7749008b tools/remus/Makefile
--- a/tools/remus/Makefile      Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/remus/Makefile      Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT=../..
+XEN_ROOT=$(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 SCRIPTS = remus
diff -r 5069eaaa9f79 -r ff3b7749008b tools/security/Makefile
--- a/tools/security/Makefile   Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/security/Makefile   Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS   += -Werror
diff -r 5069eaaa9f79 -r ff3b7749008b tools/tests/mce-test/tools/Makefile
--- a/tools/tests/mce-test/tools/Makefile       Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/tests/mce-test/tools/Makefile       Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT=../../../..
+XEN_ROOT=$(CURDIR)/../../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS   += -Werror
diff -r 5069eaaa9f79 -r ff3b7749008b tools/tests/x86_emulator/Makefile
--- a/tools/tests/x86_emulator/Makefile Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/tests/x86_emulator/Makefile Thu Mar 17 10:36:25 2011 +0000
@@ -1,5 +1,5 @@
 
-XEN_ROOT=../../..
+XEN_ROOT=$(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 TARGET := test_x86_emulator
diff -r 5069eaaa9f79 -r ff3b7749008b tools/tests/x86_emulator/blowfish.mk
--- a/tools/tests/x86_emulator/blowfish.mk      Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/tests/x86_emulator/blowfish.mk      Thu Mar 17 10:36:25 2011 +0000
@@ -1,5 +1,5 @@
 
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 CFLAGS =
 include $(XEN_ROOT)/tools/Rules.mk
 
diff -r 5069eaaa9f79 -r ff3b7749008b tools/tests/xen-access/Makefile
--- a/tools/tests/xen-access/Makefile   Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/tests/xen-access/Makefile   Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT=../../..
+XEN_ROOT=$(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS   += -Werror
diff -r 5069eaaa9f79 -r ff3b7749008b tools/vnet/doc/Makefile
--- a/tools/vnet/doc/Makefile   Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/vnet/doc/Makefile   Thu Mar 17 10:36:25 2011 +0000
@@ -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 -r 5069eaaa9f79 -r ff3b7749008b tools/vnet/examples/Makefile
--- a/tools/vnet/examples/Makefile      Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/vnet/examples/Makefile      Thu Mar 17 10:36:25 2011 +0000
@@ -1,6 +1,6 @@
 # -*- mode: Makefile; -*-
 #============================================================================
-XEN_ROOT        = ../../..
+XEN_ROOT        = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 .PHONY: all
diff -r 5069eaaa9f79 -r ff3b7749008b tools/vnet/scripts/Makefile
--- a/tools/vnet/scripts/Makefile       Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/vnet/scripts/Makefile       Thu Mar 17 10:36:25 2011 +0000
@@ -1,6 +1,6 @@
 # -*- mode: Makefile; -*-
 #============================================================================
-XEN_ROOT        = ../../..
+XEN_ROOT        = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 .PHONY: all
diff -r 5069eaaa9f79 -r ff3b7749008b tools/vtpm/Makefile
--- a/tools/vtpm/Makefile       Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/vtpm/Makefile       Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 
 # Base definitions and rules
 include $(XEN_ROOT)/tools/vtpm/Rules.mk
diff -r 5069eaaa9f79 -r ff3b7749008b tools/vtpm_manager/Makefile
--- a/tools/vtpm_manager/Makefile       Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/vtpm_manager/Makefile       Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 
 # Base definitions and rules
 include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk
diff -r 5069eaaa9f79 -r ff3b7749008b tools/vtpm_manager/crypto/Makefile
--- a/tools/vtpm_manager/crypto/Makefile        Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/vtpm_manager/crypto/Makefile        Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk
 
 BIN            = libtcpaCrypto.a
diff -r 5069eaaa9f79 -r ff3b7749008b tools/vtpm_manager/manager/Makefile
--- a/tools/vtpm_manager/manager/Makefile       Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/vtpm_manager/manager/Makefile       Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk
 
 BIN            = vtpm_managerd
diff -r 5069eaaa9f79 -r ff3b7749008b tools/vtpm_manager/migration/Makefile
--- a/tools/vtpm_manager/migration/Makefile     Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/vtpm_manager/migration/Makefile     Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk
 
 VPATH = ../manager
diff -r 5069eaaa9f79 -r ff3b7749008b tools/vtpm_manager/tcs/Makefile
--- a/tools/vtpm_manager/tcs/Makefile   Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/vtpm_manager/tcs/Makefile   Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk
 
 BIN            = libTCS.a
diff -r 5069eaaa9f79 -r ff3b7749008b tools/vtpm_manager/util/Makefile
--- a/tools/vtpm_manager/util/Makefile  Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/vtpm_manager/util/Makefile  Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../..
+XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk
 
 BIN            = libTCGUtils.a
diff -r 5069eaaa9f79 -r ff3b7749008b tools/xcutils/Makefile
--- a/tools/xcutils/Makefile    Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/xcutils/Makefile    Thu Mar 17 10:36:25 2011 +0000
@@ -8,7 +8,7 @@
 # Copyright (C) 2005 by Christian Limpach
 #
 
-XEN_ROOT       = ../..
+XEN_ROOT       = $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS += -Werror
diff -r 5069eaaa9f79 -r ff3b7749008b tools/xenbackendd/Makefile
--- a/tools/xenbackendd/Makefile        Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/xenbackendd/Makefile        Thu Mar 17 10:36:25 2011 +0000
@@ -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 -r 5069eaaa9f79 -r ff3b7749008b tools/xenmon/Makefile
--- a/tools/xenmon/Makefile     Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/xenmon/Makefile     Thu Mar 17 10:36:25 2011 +0000
@@ -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 -r 5069eaaa9f79 -r ff3b7749008b tools/xenpaging/Makefile
--- a/tools/xenpaging/Makefile  Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/xenpaging/Makefile  Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT=../..
+XEN_ROOT=$(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS   += -I $(XEN_XC)
diff -r 5069eaaa9f79 -r ff3b7749008b tools/xenpmd/Makefile
--- a/tools/xenpmd/Makefile     Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/xenpmd/Makefile     Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT=../..
+XEN_ROOT=$(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS  += -Werror
diff -r 5069eaaa9f79 -r ff3b7749008b tools/xenstat/Makefile
--- a/tools/xenstat/Makefile    Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/xenstat/Makefile    Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT = ../..
+XEN_ROOT = $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 SUBDIRS :=
diff -r 5069eaaa9f79 -r ff3b7749008b tools/xenstat/libxenstat/Makefile
--- a/tools/xenstat/libxenstat/Makefile Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/xenstat/libxenstat/Makefile Thu Mar 17 10:36:25 2011 +0000
@@ -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 -r 5069eaaa9f79 -r ff3b7749008b tools/xenstat/xentop/Makefile
--- a/tools/xenstat/xentop/Makefile     Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/xenstat/xentop/Makefile     Thu Mar 17 10:36:25 2011 +0000
@@ -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 -r 5069eaaa9f79 -r ff3b7749008b tools/xenstore/Makefile
--- a/tools/xenstore/Makefile   Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/xenstore/Makefile   Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT=../..
+XEN_ROOT=$(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 MAJOR = 3.0
diff -r 5069eaaa9f79 -r ff3b7749008b tools/xentrace/Makefile
--- a/tools/xentrace/Makefile   Thu Mar 17 08:04:10 2011 +0000
+++ b/tools/xentrace/Makefile   Thu Mar 17 10:36:25 2011 +0000
@@ -1,4 +1,4 @@
-XEN_ROOT=../..
+XEN_ROOT=$(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS  += -Werror

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog


 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.