[Xen-changelog] [xen-unstable] cross-install: Only apply in tools directory, and automatically wrap $INSTALL.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1220081762 -3600
# Node ID 05c7efee10a1d253b9b7f8b52464627aff441931
# Parent  48b33c4275f1f1599a488172d7ca5e71de941520
cross-install: Only apply in tools directory, and automatically wrap $INSTALL.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 config/StdGNU.mk    |    2 +-
 stubdom/Makefile    |    2 +-
 tools/Rules.mk      |    3 +++
 tools/cross-install |    2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff -r 48b33c4275f1 -r 05c7efee10a1 config/StdGNU.mk
--- a/config/StdGNU.mk  Sat Aug 30 08:11:09 2008 +0100
+++ b/config/StdGNU.mk  Sat Aug 30 08:36:02 2008 +0100
@@ -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 -r 48b33c4275f1 -r 05c7efee10a1 stubdom/Makefile
--- a/stubdom/Makefile  Sat Aug 30 08:11:09 2008 +0100
+++ b/stubdom/Makefile  Sat Aug 30 08:36:02 2008 +0100
@@ -1,4 +1,4 @@ XEN_ROOT = $(CURDIR)/..
-XEN_ROOT = $(CURDIR)/..
+XEN_ROOT = ..
 MINI_OS = $(XEN_ROOT)/extras/mini-os
 
 export XEN_OS=MiniOS
diff -r 48b33c4275f1 -r 05c7efee10a1 tools/Rules.mk
--- a/tools/Rules.mk    Sat Aug 30 08:11:09 2008 +0100
+++ b/tools/Rules.mk    Sat Aug 30 08:36:02 2008 +0100
@@ -4,6 +4,9 @@ all:
 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
diff -r 48b33c4275f1 -r 05c7efee10a1 tools/cross-install
--- a/tools/cross-install       Sat Aug 30 08:11:09 2008 +0100
+++ b/tools/cross-install       Sat Aug 30 08:36:02 2008 +0100
@@ -5,4 +5,4 @@ if [ -n "$CROSS_BIN_PATH" ]; then
     PATH="$CROSS_BIN_PATH:$PATH"
 fi
 
-exec install "$@"
+exec $_INSTALL "$@"

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