aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authoriap10@tetris.cl.cam.ac.uk <iap10@tetris.cl.cam.ac.uk>2005-01-25 15:37:49 +0000
committeriap10@tetris.cl.cam.ac.uk <iap10@tetris.cl.cam.ac.uk>2005-01-25 15:37:49 +0000
commit201fb48f0920e7d9cfd7d84ad03d85a23ef92fdd (patch)
tree3637ff3adcc6b26dfadec37355be2ee3b03fc5f2 /Makefile
parentfe59039ac0b2d2bf8bcc2d4718e2461817544aeb (diff)
downloadxen-201fb48f0920e7d9cfd7d84ad03d85a23ef92fdd.tar.gz
xen-201fb48f0920e7d9cfd7d84ad03d85a23ef92fdd.tar.bz2
xen-201fb48f0920e7d9cfd7d84ad03d85a23ef92fdd.zip
bitkeeper revision 1.1159.223.38 (41f667cdBlErg8MU1cuAekL1VC008w)
More fixes to the build system further to earlier patch. Signed-off-by: ian.pratt@cl.cam.ac.uk
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile22
1 files changed, 11 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index 8e2988dc08..c7b4640ecc 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,8 @@
# Grand Unified Makefile for Xen.
#
-DIST_DIR := $(CURDIR)/dist
-DESTDIR := $(DIST_DIR)/install
+DISTDIR ?= $(CURDIR)/dist
+DESTDIR ?= $(DISTDIR)/install
INSTALL := install
INSTALL_DIR := $(INSTALL) -d -m0755
@@ -40,10 +40,10 @@ install-tools:
$(MAKE) -C tools install
install-kernels:
- cp -a $(INSTALL_DIR)/boot/* /boot/
- cp -a $(INSTALL_DIR)/lib/modules/* /lib/modules/
- cp -dR $(INSTALL_DIR)/boot/*$(LINUX_VER)* $(prefix)/boot/
- cp -dR $(INSTALL_DIR)/lib/modules/* $(prefix)/lib/modules/
+ cp -a $(DESTDIR)/boot/* /boot/
+ cp -a $(DESTDIR)/lib/modules/* /lib/modules/
+ cp -dR $(DESTDIR)/boot/*$(LINUX_VER)* $(prefix)/boot/
+ cp -dR $(DESTDIR)/lib/modules/* $(prefix)/lib/modules/
install-docs:
sh ./docs/check_pkgs && $(MAKE) -C docs install || true
@@ -52,11 +52,11 @@ install-docs:
# build and install everything into local dist directory
dist: xen tools kernels docs
- $(INSTALL_DIR) $(DIST_DIR)/check
- $(INSTALL_DATA) ./COPYING $(DIST_DIR)
- $(INSTALL_DATA) ./README $(DIST_DIR)
- $(INSTALL_PROG) ./install.sh $(DIST_DIR)
- $(INSTALL_PROG) tools/check/chk tools/check/check_* $(DIST_DIR)/check
+ $(INSTALL_DIR) $(DISTDIR)/check
+ $(INSTALL_DATA) ./COPYING $(DISTDIR)
+ $(INSTALL_DATA) ./README $(DISTDIR)
+ $(INSTALL_PROG) ./install.sh $(DISTDIR)
+ $(INSTALL_PROG) tools/check/chk tools/check/check_* $(DISTDIR)/check
xen:
$(MAKE) dist=yes -C xen install