tools: use "?=" to set XEN_ROOT in Makefile

This is because when doing a stubdom build using $(CURDIR) to refer to
XEN_ROOT is wrong. Instead, when make enters directories of interest,
XEN_ROOT is already. So use "?=" is the right choice.

While in theory I can only fix up the places needed (a few libraries),
do this for all Makefiles under tools to keep things consistent.

Done by:
find tools -name Makefile -exec sed -i 's/^\(.*XEN_ROOT\s*\)=\(.*\)$/\1 ?= \2/g' {} \;

Signed-off-by: Wei Liu <wei.liu2@citrix.com>

diff --git a/tools/Makefile b/tools/Makefile
index 3f45fb94296e26680c5c8c73c91b2bc1872b2e6f..038dff810238cd8ce75f520c72960160d8244df2 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/..
+XEN_ROOT  ?=  $(CURDIR)/..
 include $(XEN_ROOT)/tools/Rules.mk
 
 SUBDIRS-y :=

diff --git a/tools/blktap2/Makefile b/tools/blktap2/Makefile
index 94200dc105b4747ce8c947bc5d738a0e97391afa..b8ec232667cd7a608e74d3ba0d66ece7415878ca 100644 (file)
--- a/tools/blktap2/Makefile
+++ b/tools/blktap2/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/../..
+XEN_ROOT  ?=  $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS  += $(CFLAGS_libxenctrl)

diff --git a/tools/blktap2/drivers/Makefile b/tools/blktap2/drivers/Makefile
index 5328c402055970173c7eff1e861b93636415f72f..b093f001f22bdf9c2d438426870deeaa317d3a92 100644 (file)
--- a/tools/blktap2/drivers/Makefile
+++ b/tools/blktap2/drivers/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT=$(CURDIR)/../../..
+XEN_ROOT ?= $(CURDIR)/../../..
 BLKTAP_ROOT= ..
 include $(XEN_ROOT)/tools/Rules.mk
 

diff --git a/tools/blktap2/lvm/Makefile b/tools/blktap2/lvm/Makefile
index 7d5f8eab061a5632d45cf76824824d4afaf47137..3d4572fe57bedee64274093b48c9728aa597e312 100644 (file)
--- a/tools/blktap2/lvm/Makefile
+++ b/tools/blktap2/lvm/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/../../..
+XEN_ROOT  ?=  $(CURDIR)/../../..
 BLKTAP_ROOT := ..
 include $(XEN_ROOT)/tools/Rules.mk
 

diff --git a/tools/blktap2/vhd/Makefile b/tools/blktap2/vhd/Makefile
index fabd6654b321be4560e66ff4d0495c1c36265c1b..718c13c8b8bb29c4a673d6c8abc0974508d2a260 100644 (file)
--- a/tools/blktap2/vhd/Makefile
+++ b/tools/blktap2/vhd/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT=$(CURDIR)/../../..
+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 ab2d6482b561178054cb333a8d8d5fac765e3274..9b840370ed17cb0b7adaac6dd2e39cff8eab5ef9 100644 (file)
--- a/tools/blktap2/vhd/lib/Makefile
+++ b/tools/blktap2/vhd/lib/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT=$(CURDIR)/../../../..
+XEN_ROOT ?= $(CURDIR)/../../../..
 BLKTAP_ROOT := ../..
 include $(XEN_ROOT)/tools/Rules.mk
 

diff --git a/tools/console/Makefile b/tools/console/Makefile
index a7bec7534dc11e05fb63bbe5c8368415764156ab..45470300afbf8961d4029df7694db9841899d75b 100644 (file)
--- a/tools/console/Makefile
+++ b/tools/console/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT=$(CURDIR)/../..
+XEN_ROOT ?= $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS  += -Werror

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

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

diff --git a/tools/debugger/gdbsx/gx/Makefile b/tools/debugger/gdbsx/gx/Makefile
index 3b8467f799107cad13007ebcbd93597e222704a1..480b0f0ecbba12ed8f048b07df6c6db9c6e67e40 100644 (file)
--- a/tools/debugger/gdbsx/gx/Makefile
+++ b/tools/debugger/gdbsx/gx/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/../../../..
+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 6a8937b8f9f7e7b353b8066a834412d79e268009..34b443bf94fef2be93fb0421b6239a9413829cc6 100644 (file)
--- a/tools/debugger/gdbsx/xg/Makefile
+++ b/tools/debugger/gdbsx/xg/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/../../../..
+XEN_ROOT  ?=  $(CURDIR)/../../../..
 include ../Rules.mk
 
 XG_HDRS := xg_public.h 

diff --git a/tools/debugger/kdd/Makefile b/tools/debugger/kdd/Makefile
index f3a597ddbc39350da2b47a5d0f122bfbe333e0d0..2f333992d4a95a56a6753b58a7fd67d06d6500a3 100644 (file)
--- a/tools/debugger/kdd/Makefile
+++ b/tools/debugger/kdd/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/../../..
+XEN_ROOT  ?=  $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS  += -Werror

diff --git a/tools/examples/Makefile b/tools/examples/Makefile
index 87dd7603cc0702249dd3821b1503de40c0e6b3a2..f1a374f42562982b1d5249fa8df1c0e1769ce3a8 100644 (file)
--- a/tools/examples/Makefile
+++ b/tools/examples/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/../..
+XEN_ROOT  ?=  $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 # Xen configuration dir and configs to go there.

diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile
index 6cc86cee6df47e8d53c2b406f8a08833d020cc67..b2c8debca03d7f5c11a1b8a17e7aaed7f945a344 100644 (file)
--- a/tools/firmware/Makefile
+++ b/tools/firmware/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/../..
+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 a0578d27c49c31dfbf31a6689f5c90370e390f51..685b7f99b331042bde8d581292f65fc35a2a282c 100644 (file)
--- a/tools/firmware/etherboot/Makefile
+++ b/tools/firmware/etherboot/Makefile
@@ -1,6 +1,6 @@
 
 override XEN_TARGET_ARCH = x86_32
-XEN_ROOT = $(CURDIR)/../../..
+XEN_ROOT  ?=  $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 include Config
 

diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile
index f2f4791055063067b7ffa743521ec2cac9d42276..98295366f3737ff2c46315b1063e0cdfd127f9c6 100644 (file)
--- a/tools/firmware/hvmloader/Makefile
+++ b/tools/firmware/hvmloader/Makefile
@@ -17,7 +17,7 @@
 # this program; If not, see <http://www.gnu.org/licenses/>.
 #
 
-XEN_ROOT = $(CURDIR)/../../..
+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 d3e882ac694987a02ba9783764f3dc1bb926c8ec..ac21a96ff48a633a8270e74361d1e758dce3c395 100644 (file)
--- a/tools/firmware/hvmloader/acpi/Makefile
+++ b/tools/firmware/hvmloader/acpi/Makefile
@@ -14,7 +14,7 @@
 # this program; If not, see <http://www.gnu.org/licenses/>.
 #
 
-XEN_ROOT = $(CURDIR)/../../../..
+XEN_ROOT  ?=  $(CURDIR)/../../../..
 include $(XEN_ROOT)/tools/firmware/Rules.mk
 
 C_SRC = build.c dsdt_anycpu.c dsdt_15cpu.c static_tables.c dsdt_anycpu_qemu_xen.c

diff --git a/tools/firmware/rombios/32bit/Makefile b/tools/firmware/rombios/32bit/Makefile
index 396906c60f6780886a7016928bb54320cb70bb69..912bcc2b05a617b9ee464ea405bc2c9a7732242b 100644 (file)
--- a/tools/firmware/rombios/32bit/Makefile
+++ b/tools/firmware/rombios/32bit/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/../../../..
+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 f6f264997d680a4e86bb8391f55d9edc879e620d..ce342a7435599a6bd8433e3b8414eefc33676cab 100644 (file)
--- a/tools/firmware/rombios/32bit/tcgbios/Makefile
+++ b/tools/firmware/rombios/32bit/tcgbios/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/../../../../..
+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 94e65db4c8cc3f8ff9f37d1b45b167ece24032fc..77863a65368b7c5cece0fbdcadb659ca685f9a84 100644 (file)
--- a/tools/firmware/rombios/Makefile
+++ b/tools/firmware/rombios/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/../../..
+XEN_ROOT  ?=  $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 SUBDIRS := 32bit

diff --git a/tools/flask/Makefile b/tools/flask/Makefile
index a31cc16def601adbaf3dfdafeea21db9748e34cf..2245a9c14b04842ece81db9819189d9b3478b155 100644 (file)
--- a/tools/flask/Makefile
+++ b/tools/flask/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/../..
+XEN_ROOT  ?=  $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 SUBDIRS-y := utils

diff --git a/tools/flask/policy/Makefile b/tools/flask/policy/Makefile
index 4be921c3a0293d4d1bf5aa36af6ec1e1881f4829..02497d913872a8c98315c0946c9df75d8baa44a5 100644 (file)
--- a/tools/flask/policy/Makefile
+++ b/tools/flask/policy/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT=$(CURDIR)/../../..
+XEN_ROOT ?= $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 ########################################

diff --git a/tools/flask/utils/Makefile b/tools/flask/utils/Makefile
index 91a53b44b83fcdc9cb73e26d403571fc10cba0b9..9cf3bc57c63508dcdced17bfb510654c9ecff017 100644 (file)
--- a/tools/flask/utils/Makefile
+++ b/tools/flask/utils/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT=$(CURDIR)/../../..
+XEN_ROOT ?= $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS += -Werror

diff --git a/tools/helpers/Makefile b/tools/helpers/Makefile
index a05a3685662d73ea5cace0e2b697fa0b7c66fb51..1bf57bc3ce8745fdd2f24c881dc0a50c20479020 100644 (file)
--- a/tools/helpers/Makefile
+++ b/tools/helpers/Makefile
@@ -2,7 +2,7 @@
 # tools/helpers/Makefile
 #
 
-XEN_ROOT = $(CURDIR)/../..
+XEN_ROOT  ?=  $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 PROGS += xen-init-dom0

diff --git a/tools/hotplug/FreeBSD/Makefile b/tools/hotplug/FreeBSD/Makefile
index 10fce4fb7abf7d9217859687ce2e153a416594ba..8061a84f2fec7d8e4b4d9f2871ce073deae6fd71 100644 (file)
--- a/tools/hotplug/FreeBSD/Makefile
+++ b/tools/hotplug/FreeBSD/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/../../..
+XEN_ROOT  ?=  $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 # Xen script dir and scripts to go there.

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

diff --git a/tools/hotplug/Linux/systemd/Makefile b/tools/hotplug/Linux/systemd/Makefile
index 83e3b32f771ceccf9fd738c9bf73c1370f40b277..2445316ded98b8a7f672c40f9f8e96d47774bf36 100644 (file)
--- a/tools/hotplug/Linux/systemd/Makefile
+++ b/tools/hotplug/Linux/systemd/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/../../../..
+XEN_ROOT  ?=  $(CURDIR)/../../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 XEN_SYSTEMD_MODULES = xen.conf

diff --git a/tools/hotplug/Makefile b/tools/hotplug/Makefile
index c1a82c1118a28a8e30691c3346ab749e10213a9c..e27f9ecb02fd9e9bb1a98763b7c10b30c484d1dc 100644 (file)
--- a/tools/hotplug/Makefile
+++ b/tools/hotplug/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/../..
+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 d01aabf8c8502182f3f75d4c9a149f490614161a..1107ea38bb04a63fa9fc145e0d907c78c092cefc 100644 (file)
--- a/tools/hotplug/NetBSD/Makefile
+++ b/tools/hotplug/NetBSD/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/../../..
+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 b53b55cdcadcac3ea91cba429d3f48a228eb6f04..ebb4f17bda0275e32f1f690cc14c21d0362e7979 100644 (file)
--- a/tools/hotplug/common/Makefile
+++ b/tools/hotplug/common/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/../../..
+XEN_ROOT  ?=  $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 HOTPLUGPATH="hotplugpath.sh"

diff --git a/tools/include/Makefile b/tools/include/Makefile
index dec8b3d352549e2ecdc4dc0250c6bcb6a2306ea6..ed2561267ab8b62793a6d7063ef8628d01f08f45 100644 (file)
--- a/tools/include/Makefile
+++ b/tools/include/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/../..
+XEN_ROOT  ?=  $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 # Relative to $(XEN_ROOT)/xen/xsm/flask

diff --git a/tools/include/xen-foreign/Makefile b/tools/include/xen-foreign/Makefile
index 80a446a5273b6b10276bb509a2c6e60c5f7d69d4..22b969a02263aedf46b1d14a6db791c6c88a262f 100644 (file)
--- a/tools/include/xen-foreign/Makefile
+++ b/tools/include/xen-foreign/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT=$(CURDIR)/../../..
+XEN_ROOT ?= $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 ROOT = $(XEN_ROOT)/xen/include/public

diff --git a/tools/libfsimage/Makefile b/tools/libfsimage/Makefile
index 69fd18a82032aed65cfbde4aebeafd543e10de60..d66fbebda8640eb5b6ca53073fdb3110297e7413 100644 (file)
--- a/tools/libfsimage/Makefile
+++ b/tools/libfsimage/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/../..
+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 4840bc2ec7a2a1b50acd5278c93737f1c856ea01..f64f66a2bab329569f26035a41d50c40a6267054 100644 (file)
--- a/tools/libfsimage/common/Makefile
+++ b/tools/libfsimage/common/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/../../..
+XEN_ROOT  ?=  $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/libfsimage/Rules.mk
 
 MAJOR = 1.0

diff --git a/tools/libfsimage/ext2fs-lib/Makefile b/tools/libfsimage/ext2fs-lib/Makefile
index 0e00fde0e17e458e03d3e01919a3468d5c72f79e..7f606e7ec0d525f781104cb74602b1d441f8f6b1 100644 (file)
--- a/tools/libfsimage/ext2fs-lib/Makefile
+++ b/tools/libfsimage/ext2fs-lib/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/../../..
+XEN_ROOT  ?=  $(CURDIR)/../../..
 
 LIB_SRCS-y = ext2fs-lib.c
 

diff --git a/tools/libfsimage/ext2fs/Makefile b/tools/libfsimage/ext2fs/Makefile
index 8ff4c71a1c13fecc0ebb51bc7dba4ac360ceef90..986012ab022fb22a12095acc368f21ed36c075dd 100644 (file)
--- a/tools/libfsimage/ext2fs/Makefile
+++ b/tools/libfsimage/ext2fs/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/../../..
+XEN_ROOT  ?=  $(CURDIR)/../../..
 
 LIB_SRCS-y = fsys_ext2fs.c
 

diff --git a/tools/libfsimage/fat/Makefile b/tools/libfsimage/fat/Makefile
index 2911a0e0e7cfb13c4c3ea1d03d284e0ef2d33c32..dacec211ee22adab0e7d62c0b150199d50d5c2c5 100644 (file)
--- a/tools/libfsimage/fat/Makefile
+++ b/tools/libfsimage/fat/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/../../..
+XEN_ROOT  ?=  $(CURDIR)/../../..
 
 LIB_SRCS-y = fsys_fat.c
 

diff --git a/tools/libfsimage/iso9660/Makefile b/tools/libfsimage/iso9660/Makefile
index 4096cafa0c1db76653c5ab284a6785355c9183c3..0915b269262f7a622759937211173f5f2750211e 100644 (file)
--- a/tools/libfsimage/iso9660/Makefile
+++ b/tools/libfsimage/iso9660/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/../../..
+XEN_ROOT  ?=  $(CURDIR)/../../..
 
 LIB_SRCS-y = fsys_iso9660.c
 

diff --git a/tools/libfsimage/reiserfs/Makefile b/tools/libfsimage/reiserfs/Makefile
index 57f286b25655340b31b9961647a252c319f19c3b..06f109d973a21728510aac80eb609aed56134a3d 100644 (file)
--- a/tools/libfsimage/reiserfs/Makefile
+++ b/tools/libfsimage/reiserfs/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/../../..
+XEN_ROOT  ?=  $(CURDIR)/../../..
 
 LIB_SRCS-y = fsys_reiserfs.c
 

diff --git a/tools/libfsimage/ufs/Makefile b/tools/libfsimage/ufs/Makefile
index c1371080f5283e95d040d8c68138b1a17712f45d..7dcea7d4c241dff03945cf1e67d343fa25c0a299 100644 (file)
--- a/tools/libfsimage/ufs/Makefile
+++ b/tools/libfsimage/ufs/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/../../..
+XEN_ROOT  ?=  $(CURDIR)/../../..
 
 LIB_SRCS-y = fsys_ufs.c
 

diff --git a/tools/libfsimage/xfs/Makefile b/tools/libfsimage/xfs/Makefile
index 65800074044962ff06e658bc8608a2a3bd9b3089..1ce6b1c75627ba8ebd9e3ebb33d128a2eef9f268 100644 (file)
--- a/tools/libfsimage/xfs/Makefile
+++ b/tools/libfsimage/xfs/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/../../..
+XEN_ROOT  ?=  $(CURDIR)/../../..
 
 LIB_SRCS-y = fsys_xfs.c
 

diff --git a/tools/libfsimage/zfs/Makefile b/tools/libfsimage/zfs/Makefile
index 4b9f131a5747aacb1dc7d7b37d70c88ab3cc1f54..6d5cdf18a43696ea5b6579fc12a19e10e0114806 100644 (file)
--- a/tools/libfsimage/zfs/Makefile
+++ b/tools/libfsimage/zfs/Makefile
@@ -21,7 +21,7 @@
 #  Use is subject to license terms.
 #
 
-XEN_ROOT = $(CURDIR)/../../..
+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/libs/Makefile b/tools/libs/Makefile
index dc5726d00ab8fa2a100536137e64a61c4a832e1a..f732a1c9aa6f23bd456133139a68d3207c7ceac5 100644 (file)
--- a/tools/libs/Makefile
+++ b/tools/libs/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/../..
+XEN_ROOT  ?=  $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 SUBDIRS-y :=

diff --git a/tools/libs/call/Makefile b/tools/libs/call/Makefile
index 9402ea5af63fb0697151dbbd2c079a7af0babcc2..76f69801ec2461ec04f4d3785fe93bc7140a335d 100644 (file)
--- a/tools/libs/call/Makefile
+++ b/tools/libs/call/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/../../..
+XEN_ROOT  ?=  $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 MAJOR    = 1

diff --git a/tools/libs/evtchn/Makefile b/tools/libs/evtchn/Makefile
index 991786446f043f838d9cfbcf48ba54d587e12293..74374fc54e4513f543c7e6ef880bf4b0a00b515f 100644 (file)
--- a/tools/libs/evtchn/Makefile
+++ b/tools/libs/evtchn/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/../../..
+XEN_ROOT  ?=  $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 MAJOR    = 1

diff --git a/tools/libs/foreignmemory/Makefile b/tools/libs/foreignmemory/Makefile
index f062f45a912338e777b23d5850e5f9eec4279742..fb11b0db7c04fc7af88bed8acd753047f31c9baa 100644 (file)
--- a/tools/libs/foreignmemory/Makefile
+++ b/tools/libs/foreignmemory/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/../../..
+XEN_ROOT  ?=  $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 MAJOR    = 1

diff --git a/tools/libs/gnttab/Makefile b/tools/libs/gnttab/Makefile
index af6454206f1a3c5a3476125ede1434001cfae3f1..ed570e8bea1be5dd626faa4efd4d916d76eb40af 100644 (file)
--- a/tools/libs/gnttab/Makefile
+++ b/tools/libs/gnttab/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/../../..
+XEN_ROOT  ?=  $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 MAJOR    = 1

diff --git a/tools/libs/toollog/Makefile b/tools/libs/toollog/Makefile
index fb701bef42bab5c1bc67454176a27d0bd74464e0..a65295916502042ddefb62b662151f26555478c7 100644 (file)
--- a/tools/libs/toollog/Makefile
+++ b/tools/libs/toollog/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/../../..
+XEN_ROOT  ?=  $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 MAJOR  = 1

diff --git a/tools/libvchan/Makefile b/tools/libvchan/Makefile
index 0573d2f9891ba7044c92eb31a664497bde4609ef..9ff09e9bce9c8edfed7b75236f3405b880c52a32 100644 (file)
--- a/tools/libvchan/Makefile
+++ b/tools/libvchan/Makefile
@@ -2,7 +2,7 @@
 # tools/libvchan/Makefile
 #
 
-XEN_ROOT = $(CURDIR)/../..
+XEN_ROOT  ?=  $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 LIBVCHAN_OBJS = init.o io.o

diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index 608404feb9e78692a7b890f34c9438f492c38267..1619c06d753c60d863609e668756a61bb34906c4 100644 (file)
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/../..
+XEN_ROOT  ?=  $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 MAJOR    = 4.6

diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
index 789a12e957943412c481a30de03e8d4b7eb6e2bb..81c3db4a1c38a77363b6773206f7fd1171c496b7 100644 (file)
--- a/tools/libxl/Makefile
+++ b/tools/libxl/Makefile
@@ -2,7 +2,7 @@
 # tools/libxl/Makefile
 #
 
-XEN_ROOT = $(CURDIR)/../..
+XEN_ROOT  ?=  $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 MAJOR = 4.6

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

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

diff --git a/tools/ocaml/Makefile b/tools/ocaml/Makefile
index cfa931a4d01f84847aca3c1ebdbe4dfb1aeea16b..f3d07e772030c8caec941318e72ba4ad1a985709 100644 (file)
--- a/tools/ocaml/Makefile
+++ b/tools/ocaml/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/../..
+XEN_ROOT  ?=  $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 SUBDIRS := libs

diff --git a/tools/ocaml/libs/Makefile b/tools/ocaml/libs/Makefile
index f7c3c0e64613be5d73e841c647754f4bc9f0a99f..afb975f17f8cf5ef45e23ea8eb87192139492d69 100644 (file)
--- a/tools/ocaml/libs/Makefile
+++ b/tools/ocaml/libs/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/../../..
+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 154efd4a8e1fd6ff96b01c1f41c1f1b862beb891..3b3761a7a5487faf5ee353affce2f4b14056b387 100644 (file)
--- a/tools/ocaml/libs/eventchn/Makefile
+++ b/tools/ocaml/libs/eventchn/Makefile
@@ -1,5 +1,5 @@
 TOPLEVEL=$(CURDIR)/../..
-XEN_ROOT=$(TOPLEVEL)/../..
+XEN_ROOT ?= $(TOPLEVEL)/../..
 include $(TOPLEVEL)/common.make
 
 CFLAGS += $(CFLAGS_libxenevtchn) $(CFLAGS_xeninclude)

diff --git a/tools/ocaml/libs/mmap/Makefile b/tools/ocaml/libs/mmap/Makefile
index df45819df535409c9d13cc35ce832771e6556964..a3359bc96b233045ab549c3fc44ad5e288fa4de7 100644 (file)
--- a/tools/ocaml/libs/mmap/Makefile
+++ b/tools/ocaml/libs/mmap/Makefile
@@ -1,5 +1,5 @@
 TOPLEVEL=$(CURDIR)/../..
-XEN_ROOT=$(TOPLEVEL)/../..
+XEN_ROOT ?= $(TOPLEVEL)/../..
 include $(TOPLEVEL)/common.make
 
 OBJS = xenmmap

diff --git a/tools/ocaml/libs/xb/Makefile b/tools/ocaml/libs/xb/Makefile
index 09d1bc8946ae731072d8e0531df8b4e907f0bfd0..c41aa92b7c9b209e187ddbc5bdafb3f59d58abfd 100644 (file)
--- a/tools/ocaml/libs/xb/Makefile
+++ b/tools/ocaml/libs/xb/Makefile
@@ -1,5 +1,5 @@
 TOPLEVEL=$(CURDIR)/../..
-XEN_ROOT=$(TOPLEVEL)/../..
+XEN_ROOT ?= $(TOPLEVEL)/../..
 include $(TOPLEVEL)/common.make
 
 CFLAGS += -I../mmap

diff --git a/tools/ocaml/libs/xc/Makefile b/tools/ocaml/libs/xc/Makefile
index d24b0144d020060de16f45db7ab9b782e412fe40..3b83138dc0dcbb83b4e433fea67babb6edb7a40d 100644 (file)
--- a/tools/ocaml/libs/xc/Makefile
+++ b/tools/ocaml/libs/xc/Makefile
@@ -1,5 +1,5 @@
 TOPLEVEL=$(CURDIR)/../..
-XEN_ROOT=$(TOPLEVEL)/../..
+XEN_ROOT ?= $(TOPLEVEL)/../..
 include $(TOPLEVEL)/common.make
 
 CFLAGS += -I../mmap $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest)

diff --git a/tools/ocaml/libs/xentoollog/Makefile b/tools/ocaml/libs/xentoollog/Makefile
index 8ae0a784fda9cc96a0d79066c54350d2874903e4..75b4664763a9083e4b8d56776d70cf99117ee54e 100644 (file)
--- a/tools/ocaml/libs/xentoollog/Makefile
+++ b/tools/ocaml/libs/xentoollog/Makefile
@@ -1,5 +1,5 @@
 TOPLEVEL=$(CURDIR)/../..
-XEN_ROOT=$(TOPLEVEL)/../..
+XEN_ROOT ?= $(TOPLEVEL)/../..
 include $(TOPLEVEL)/common.make
 
 # allow mixed declarations and code

diff --git a/tools/ocaml/libs/xl/Makefile b/tools/ocaml/libs/xl/Makefile
index 0d1549dd3a814490c6e36c8127eed143a5b0f304..66d0c3ecba3b993c9b36937bbd589c83d657117b 100644 (file)
--- a/tools/ocaml/libs/xl/Makefile
+++ b/tools/ocaml/libs/xl/Makefile
@@ -1,5 +1,5 @@
 TOPLEVEL=$(CURDIR)/../..
-XEN_ROOT=$(TOPLEVEL)/../..
+XEN_ROOT ?= $(TOPLEVEL)/../..
 include $(TOPLEVEL)/common.make
 
 # ignore unused generated functions and allow mixed declarations and code

diff --git a/tools/ocaml/libs/xs/Makefile b/tools/ocaml/libs/xs/Makefile
index 7a3d886d7b4c2b4c03b993a70a892607ca835f37..c9f2f54677ee169e5b8f02947b08550ac7cb7ada 100644 (file)
--- a/tools/ocaml/libs/xs/Makefile
+++ b/tools/ocaml/libs/xs/Makefile
@@ -1,5 +1,5 @@
 TOPLEVEL=$(CURDIR)/../..
-XEN_ROOT=$(TOPLEVEL)/../..
+XEN_ROOT ?= $(TOPLEVEL)/../..
 include $(TOPLEVEL)/common.make
 
 OCAMLINCLUDE += -I ../xb/

diff --git a/tools/ocaml/test/Makefile b/tools/ocaml/test/Makefile
index 30a304b6d1d2f2c9354751b19c7c5decb7b9d33e..737d5f17a10bdb21c26244bc0a758ba0d05bc15a 100644 (file)
--- a/tools/ocaml/test/Makefile
+++ b/tools/ocaml/test/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/../../..
+XEN_ROOT  ?=  $(CURDIR)/../../..
 OCAML_TOPLEVEL = $(CURDIR)/..
 include $(OCAML_TOPLEVEL)/common.make
 

diff --git a/tools/ocaml/xenstored/Makefile b/tools/ocaml/xenstored/Makefile
index 59875f70866a6086c8f8c2a14217526ec840b5c4..a0274a2134720d88bb19d0adcd26abdf670399c3 100644 (file)
--- a/tools/ocaml/xenstored/Makefile
+++ b/tools/ocaml/xenstored/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/../../..
+XEN_ROOT  ?=  $(CURDIR)/../../..
 OCAML_TOPLEVEL = $(CURDIR)/..
 include $(OCAML_TOPLEVEL)/common.make
 

diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
index fe8e03b0bdcf26da0901f76385c8bfedc2464528..e423be42e833f799298b7e11ebbd2017af47da2e 100644 (file)
--- a/tools/pygrub/Makefile
+++ b/tools/pygrub/Makefile
@@ -1,5 +1,5 @@
 
-XEN_ROOT = $(CURDIR)/../..
+XEN_ROOT  ?=  $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 PY_CFLAGS = $(CFLAGS) $(PY_NOOPT_CFLAGS) $(APPEND_LDFLAGS)

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

diff --git a/tools/tests/Makefile b/tools/tests/Makefile
index adeb120abc2cab257d078fcc3fc7abe0131ab0b3..6902bd277859ceb5d2b243bb929e220b326cdb3c 100644 (file)
--- a/tools/tests/Makefile
+++ b/tools/tests/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/../..
+XEN_ROOT  ?=  $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS  += $(CFLAGS_libxenctrl)

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

diff --git a/tools/tests/mem-sharing/Makefile b/tools/tests/mem-sharing/Makefile
index d89e2836fbbba0f87ad4d59ff35ee15c283c7ccd..39ff84e30596cdb12f127f264481316632628a21 100644 (file)
--- a/tools/tests/mem-sharing/Makefile
+++ b/tools/tests/mem-sharing/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT=$(CURDIR)/../../..
+XEN_ROOT ?= $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS += -Werror

diff --git a/tools/tests/regression/Makefile b/tools/tests/regression/Makefile
index 70d524aee8dec5b5c2be7466a6d4485ab5b71c2a..83d871b7d98bb9346021ad82563b8672725a1d2b 100644 (file)
--- a/tools/tests/regression/Makefile
+++ b/tools/tests/regression/Makefile
@@ -5,7 +5,7 @@
 # To run this, at least the basic build / development environment must
 # be installed (gcc, ...)
 #
-XEN_ROOT=$(PWD)/../../..
+XEN_ROOT ?= $(PWD)/../../..
 REG_TEST_DIR=$(PWD)
 
 PYTHON_VERSIONS=python-2.3 python-2.4 python-2.5 python-2.6 python-3.1

diff --git a/tools/tests/vhpet/Makefile b/tools/tests/vhpet/Makefile
index cb88dd01c5f8ba11871d6540914a6bef30de291d..5ed27206068aa65ee5e0f455f0486842c480795f 100644 (file)
--- a/tools/tests/vhpet/Makefile
+++ b/tools/tests/vhpet/Makefile
@@ -1,5 +1,5 @@
 
-XEN_ROOT=$(CURDIR)/../../..
+XEN_ROOT ?= $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 TARGET := test_vhpet

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

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

diff --git a/tools/xcutils/Makefile b/tools/xcutils/Makefile
index e127af8c2eaac7cb76da2115d24e7ef48c763b79..ed83644aae2fc5dfb074152c2fcbaa48e093806f 100644 (file)
--- a/tools/xcutils/Makefile
+++ b/tools/xcutils/Makefile
@@ -8,7 +8,7 @@
 # Copyright (C) 2005 by Christian Limpach
 #
 
-XEN_ROOT       = $(CURDIR)/../..
+XEN_ROOT        ?=  $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 PROGRAMS = readnotes lsevtchn

diff --git a/tools/xenbackendd/Makefile b/tools/xenbackendd/Makefile
index f52be74f1323be5dded305e20f07f429d33c3162..06ad929d23e0123aea27235e31b02d1a6d448b5e 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=$(CURDIR)/../..
+XEN_ROOT ?= $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS  += -Werror

diff --git a/tools/xenmon/Makefile b/tools/xenmon/Makefile
index 98056f24de6f61e622c445fb0553c9c3bce9d7eb..6c26e8c9add0f0e84fb43d5d3ada99ed220c6189 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=$(CURDIR)/../..
+XEN_ROOT ?= $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS  += -Werror

diff --git a/tools/xenpaging/Makefile b/tools/xenpaging/Makefile
index 64876b3a2017ce65c2ffbfd5080a0b2bf0f54c0e..58b1eaab1d673c3194eb0899f8af4fd73ef52fce 100644 (file)
--- a/tools/xenpaging/Makefile
+++ b/tools/xenpaging/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT=$(CURDIR)/../..
+XEN_ROOT ?= $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 # xenpaging.c and file_ops.c incorrectly use libxc internals

diff --git a/tools/xenpmd/Makefile b/tools/xenpmd/Makefile
index 55e8fc5f0f5a74341c1444b27b5186eac12d6aee..8eb417b651815d9c6db11d1cba027b6d7687ba58 100644 (file)
--- a/tools/xenpmd/Makefile
+++ b/tools/xenpmd/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT=$(CURDIR)/../..
+XEN_ROOT ?= $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS += -Werror

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

diff --git a/tools/xenstat/libxenstat/Makefile b/tools/xenstat/libxenstat/Makefile
index 850d24ab2bcc03636901a2bf89003f56360f0601..99de0a17214ba2667b2355b04893714bcb23e928 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=$(CURDIR)/../../..
+XEN_ROOT ?= $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 LDCONFIG=ldconfig

diff --git a/tools/xenstat/xentop/Makefile b/tools/xenstat/xentop/Makefile
index 1cc393f457f2fbf8031d07bce3891143e426953d..40632483638915fc88610f45397d877475eac0b7 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=$(CURDIR)/../../..
+XEN_ROOT ?= $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 ifneq ($(XENSTAT_XENTOP),y)

diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index d691b7811cb3bd199a3ff8bf781afa58e0e38577..3b2c813f9c1e2f97caf64e34a5cf413c94bf1005 100644 (file)
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT=$(CURDIR)/../..
+XEN_ROOT ?= $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 MAJOR = 3.0

diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile
index 0157be2d35a61b8fd992ba1d23f27ea45a6716c0..52a14b1910a36d0250e240ccfd8d2114ce6af720 100644 (file)
--- a/tools/xentrace/Makefile
+++ b/tools/xentrace/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT=$(CURDIR)/../..
+XEN_ROOT ?= $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS += -Werror