ia64/xen-unstable

changeset 18420:05c7efee10a1

cross-install: Only apply in tools directory, and automatically wrap $INSTALL.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Sat Aug 30 08:36:02 2008 +0100 (2008-08-30)
parents 48b33c4275f1
children d0a544d8a3f3 7eefe6399bcd
files config/StdGNU.mk stubdom/Makefile tools/Rules.mk tools/cross-install
line diff
     1.1 --- a/config/StdGNU.mk	Sat Aug 30 08:11:09 2008 +0100
     1.2 +++ b/config/StdGNU.mk	Sat Aug 30 08:36:02 2008 +0100
     1.3 @@ -16,7 +16,7 @@ MSGMERGE   = msgmerge
     1.4  # Allow git to be wrappered in the environment
     1.5  GIT        ?= git
     1.6  
     1.7 -INSTALL      = $(XEN_ROOT)/tools/cross-install
     1.8 +INSTALL      = install
     1.9  INSTALL_DIR  = $(INSTALL) -d -m0755 -p
    1.10  INSTALL_DATA = $(INSTALL) -m0644 -p
    1.11  INSTALL_PROG = $(INSTALL) -m0755 -p
     2.1 --- a/stubdom/Makefile	Sat Aug 30 08:11:09 2008 +0100
     2.2 +++ b/stubdom/Makefile	Sat Aug 30 08:36:02 2008 +0100
     2.3 @@ -1,4 +1,4 @@
     2.4 -XEN_ROOT = $(CURDIR)/..
     2.5 +XEN_ROOT = ..
     2.6  MINI_OS = $(XEN_ROOT)/extras/mini-os
     2.7  
     2.8  export XEN_OS=MiniOS
     3.1 --- a/tools/Rules.mk	Sat Aug 30 08:11:09 2008 +0100
     3.2 +++ b/tools/Rules.mk	Sat Aug 30 08:36:02 2008 +0100
     3.3 @@ -5,6 +5,9 @@ all:
     3.4  
     3.5  include $(XEN_ROOT)/Config.mk
     3.6  
     3.7 +export _INSTALL := $(INSTALL)
     3.8 +INSTALL = $(XEN_ROOT)/tools/cross-install
     3.9 +
    3.10  XEN_INCLUDE        = $(XEN_ROOT)/tools/include
    3.11  XEN_XC             = $(XEN_ROOT)/tools/python/xen/lowlevel/xc
    3.12  XEN_LIBXC          = $(XEN_ROOT)/tools/libxc
     4.1 --- a/tools/cross-install	Sat Aug 30 08:11:09 2008 +0100
     4.2 +++ b/tools/cross-install	Sat Aug 30 08:36:02 2008 +0100
     4.3 @@ -5,4 +5,4 @@ if [ -n "$CROSS_BIN_PATH" ]; then
     4.4      PATH="$CROSS_BIN_PATH:$PATH"
     4.5  fi
     4.6  
     4.7 -exec install "$@"
     4.8 +exec $_INSTALL "$@"