aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authoriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>2005-01-22 21:34:34 +0000
committeriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>2005-01-22 21:34:34 +0000
commit6b422c28fad9b0c0a9caf5c98eb8db1d7914e976 (patch)
tree9ac7c81ead8ad08baa150576d398370583c433e4 /Makefile
parentdbaf99ecd4456954accb1e84013d857bb0ac2808 (diff)
downloadxen-6b422c28fad9b0c0a9caf5c98eb8db1d7914e976.tar.gz
xen-6b422c28fad9b0c0a9caf5c98eb8db1d7914e976.tar.bz2
xen-6b422c28fad9b0c0a9caf5c98eb8db1d7914e976.zip
bitkeeper revision 1.1159.223.18 (41f2c6eamwtTkjdrv4CuL1WnOy4iGw)
Description: use INSTALL everywhere Use install(by way of INSTALL variables) to create directories, install programs, and install data files. From: Adam Heath <doogie@brainfood.com> Signed-off-by: ian.pratt@cl.cam.ac.uk
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile22
1 files changed, 13 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 7332978f99..ecbc022e10 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,10 @@
DIST_DIR ?= $(shell pwd)/dist
INSTALL_DIR ?= $(DIST_DIR)/install
+INSTALL := install
+INSTALL_DIR := $(INSTALL) -d -m0755
+INSTALL_DATA := $(INSTALL) -m0644
+INSTALL_PROG := $(INSTALL) -m0755
KERNELS ?= linux-2.6-xen0 linux-2.6-xenU
# linux-2.4-xen0 linux-2.4-xenU netbsd-2.0-xenU
@@ -35,21 +39,21 @@ install-tools:
$(MAKE) -C tools install
install-kernels:
- $(shell cp -a $(INSTALL_DIR)/boot/* /boot/)
- $(shell cp -a $(INSTALL_DIR)/lib/modules/* /lib/modules/)
- $(shell cp -dR $(INSTALL_DIR)/boot/*$(LINUX_VER)* $(prefix)/boot/)
- $(shell cp -dR $(INSTALL_DIR)/lib/modules/* $(prefix)/lib/modules/)
+ 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/
install-docs:
sh ./docs/check_pkgs && $(MAKE) -C docs install || true
# build and install everything into local dist directory
dist: xen tools kernels docs
- install -m0644 ./COPYING $(DIST_DIR)
- install -m0644 ./README $(DIST_DIR)
- install -m0755 ./install.sh $(DIST_DIR)
- mkdir -p $(DIST_DIR)/check
- install -m0755 tools/check/chk tools/check/check_* $(DIST_DIR)/check
+ $(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
xen:
$(MAKE) prefix=$(INSTALL_DIR) dist=yes -C xen install