cross-install: Only apply in tools directory, and automatically wrap $INSTALL.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/config/StdGNU.mk b/config/StdGNU.mk
index a7263dcf4079ea7233e828d0c44eaa9c831b86a4..aaa89a26643d0c1f758409d406c5c648daaafb34 100644 (file)
--- a/config/StdGNU.mk
+++ b/config/StdGNU.mk
@@ -16,7 +16,7 @@ MSGMERGE   = msgmerge
 # Allow git to be wrappered in the environment
 GIT        ?= git
 
-INSTALL      = $(XEN_ROOT)/tools/cross-install
+INSTALL      = install
 INSTALL_DIR  = $(INSTALL) -d -m0755 -p
 INSTALL_DATA = $(INSTALL) -m0644 -p
 INSTALL_PROG = $(INSTALL) -m0755 -p

diff --git a/stubdom/Makefile b/stubdom/Makefile
index 15de9eb536ecc187ee54a1caf4dc37f10b4b622b..b94c4422a89e549d1a2b2b138c2449e61751ac95 100644 (file)
--- a/stubdom/Makefile
+++ b/stubdom/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/..
+XEN_ROOT = ..
 MINI_OS = $(XEN_ROOT)/extras/mini-os
 
 export XEN_OS=MiniOS

diff --git a/tools/Rules.mk b/tools/Rules.mk
index 29639a341d931253062e53d0b1832fddc0c4fa41..a477c8253b9db257e8485bcc62868daad1b46518 100644 (file)
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -5,6 +5,9 @@ all:
 
 include $(XEN_ROOT)/Config.mk
 
+export _INSTALL := $(INSTALL)
+INSTALL = $(XEN_ROOT)/tools/cross-install
+
 XEN_INCLUDE        = $(XEN_ROOT)/tools/include
 XEN_XC             = $(XEN_ROOT)/tools/python/xen/lowlevel/xc
 XEN_LIBXC          = $(XEN_ROOT)/tools/libxc

diff --git a/tools/cross-install b/tools/cross-install
index 2b67bb34cf326cbe051ecffaae34178f465a5678..1177335aa5a207c064d2707d0a01d6e0818e0c26 100755 (executable)
--- a/tools/cross-install
+++ b/tools/cross-install
@@ -5,4 +5,4 @@ if [ -n "$CROSS_BIN_PATH" ]; then
     PATH="$CROSS_BIN_PATH:$PATH"
 fi
 
-exec install "$@"
+exec $_INSTALL "$@"