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

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

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

stubdom/Makefile

@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/..
+XEN_ROOT = ..
 MINI_OS = $(XEN_ROOT)/extras/mini-os
 
 export XEN_OS=MiniOS

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

tools/cross-install

@@ -5,4 +5,4 @@ if [ -n "$CROSS_BIN_PATH" ]; then
     PATH="$CROSS_BIN_PATH:$PATH"
 fi
 
-exec install "$@"
+exec $_INSTALL "$@"