1.1 --- a/Config.mk	Wed Oct 05 11:43:23 2005 +0100
     1.2 +++ b/Config.mk	Wed Oct 05 13:32:00 2005 +0100
     1.3 @@ -20,6 +20,15 @@ STRIP      = $(CROSS_COMPILE)strip
     1.4  OBJCOPY    = $(CROSS_COMPILE)objcopy
     1.5  OBJDUMP    = $(CROSS_COMPILE)objdump
     1.6  
     1.7 +# Default is to install to local 'dist' directory.
     1.8 +DISTDIR ?= $(XEN_ROOT)/dist
     1.9 +DESTDIR ?= $(DISTDIR)/install
    1.10 +
    1.11 +INSTALL      = install
    1.12 +INSTALL_DIR  = $(INSTALL) -d -m0755
    1.13 +INSTALL_DATA = $(INSTALL) -m0644
    1.14 +INSTALL_PROG = $(INSTALL) -m0755
    1.15 +
    1.16  ifeq ($(XEN_TARGET_ARCH),x86_64)
    1.17  LIBDIR = lib64
    1.18  else
    1.19 @@ -49,3 +58,5 @@ ACM_USE_SECURITY_POLICY ?= ACM_NULL_POLI
    1.20  XENSTAT_XENTOP ?= y
    1.21  
    1.22  VTPM_TOOLS ?= n
    1.23 +
    1.24 +-include $(XEN_ROOT)/.config

     2.1 --- a/Makefile	Wed Oct 05 11:43:23 2005 +0100
     2.2 +++ b/Makefile	Wed Oct 05 13:32:00 2005 +0100
     2.3 @@ -2,23 +2,12 @@
     2.4  # Grand Unified Makefile for Xen.
     2.5  #
     2.6  
     2.7 -# Default is to install to local 'dist' directory.
     2.8 -DISTDIR ?= $(CURDIR)/dist
     2.9 -DESTDIR ?= $(DISTDIR)/install
    2.10 -
    2.11 -INSTALL		:= install
    2.12 -INSTALL_DIR	:= $(INSTALL) -d -m0755
    2.13 -INSTALL_DATA	:= $(INSTALL) -m0644
    2.14 -INSTALL_PROG	:= $(INSTALL) -m0755
    2.15 -
    2.16  KERNELS ?= linux-2.6-xen0 linux-2.6-xenU
    2.17  # linux-2.4-xen0 linux-2.4-xenU netbsd-2.0-xenU
    2.18  # You may use wildcards in the above e.g. KERNELS=*2.4*
    2.19  
    2.20  XKERNELS := $(foreach kernel, $(KERNELS), $(patsubst buildconfigs/mk.%,%,$(wildcard buildconfigs/mk.$(kernel))) )
    2.21  
    2.22 -export DESTDIR
    2.23 -
    2.24  # Export target architecture overrides to Xen and Linux sub-trees.
    2.25  ifneq ($(XEN_TARGET_ARCH),)
    2.26  SUBARCH := $(subst x86_32,i386,$(XEN_TARGET_ARCH))
    2.27 @@ -28,6 +17,7 @@ endif
    2.28  # Default target must appear before any include lines
    2.29  all: dist
    2.30  
    2.31 +XEN_ROOT=$(CURDIR)
    2.32  include Config.mk
    2.33  include buildconfigs/Rules.mk
    2.34  

     3.1 --- a/buildconfigs/Rules.mk	Wed Oct 05 11:43:23 2005 +0100
     3.2 +++ b/buildconfigs/Rules.mk	Wed Oct 05 13:32:00 2005 +0100
     3.3 @@ -6,6 +6,8 @@ include Config.mk
     3.4  DISTDIR	?= $(CURDIR)/dist
     3.5  DESTDIR	?= $(DISTDIR)/install
     3.6  
     3.7 +export DESTDIR
     3.8 +
     3.9  ALLKERNELS = $(patsubst buildconfigs/mk.%,%,$(wildcard buildconfigs/mk.*))
    3.10  ALLSPARSETREES = $(patsubst %-xen-sparse,%,$(wildcard *-xen-sparse))
    3.11  

     4.1 --- a/xen/Rules.mk	Wed Oct 05 11:43:23 2005 +0100
     4.2 +++ b/xen/Rules.mk	Wed Oct 05 13:32:00 2005 +0100
     4.3 @@ -10,7 +10,8 @@ trace       ?= n
     4.4  domu_debug  ?= n
     4.5  crash_debug ?= n
     4.6  
     4.7 -include $(BASEDIR)/../Config.mk
     4.8 +XEN_ROOT=$(BASEDIR)/..
     4.9 +include $(XEN_ROOT)/Config.mk
    4.10  
    4.11  # Set ARCH/SUBARCH appropriately.
    4.12  override COMPILE_SUBARCH := $(XEN_COMPILE_ARCH)