ia64/xen-unstable

changeset 3542:bbfc7fe2e910

bitkeeper revision 1.1159.212.43 (41f6889dsyi21HaKtveW23DPeBwliw)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
author kaf24@scramble.cl.cam.ac.uk
date Tue Jan 25 17:57:49 2005 +0000 (2005-01-25)
parents 93b8d938e316 71a2a8ee7f0b
children 08e173bd9db1 1b6a9577c36d
files Makefile
line diff
     1.1 --- a/Makefile	Tue Jan 25 16:51:25 2005 +0000
     1.2 +++ b/Makefile	Tue Jan 25 17:57:49 2005 +0000
     1.3 @@ -2,6 +2,10 @@
     1.4  # Grand Unified Makefile for Xen.
     1.5  #
     1.6  
     1.7 +# Default is to install to local 'dist' directory.
     1.8 +DISTDIR ?= $(CURDIR)/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 @@ -27,6 +31,7 @@ all: dist
    1.15  
    1.16  # install everything into the standard system directories
    1.17  # NB: install explicitly does not check that everything is up to date!
    1.18 +install: DESTDIR=
    1.19  install: xen checked-tools kernels docs
    1.20  
    1.21  # Only check for install req'mts on 'make install', not on 'make dist'.
    1.22 @@ -35,8 +40,6 @@ checked-tools:
    1.23  	$(MAKE) -C tools install
    1.24  
    1.25  # build and install everything into local dist directory
    1.26 -dist: DISTDIR=$(CURDIR)/dist
    1.27 -dist: DESTDIR=$(DISTDIR)/install
    1.28  dist: xen tools kernels docs
    1.29  	$(INSTALL_DIR) $(DISTDIR)/check
    1.30  	$(INSTALL_DATA) ./COPYING $(DISTDIR)