aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorkaf24@freefall.cl.cam.ac.uk <kaf24@freefall.cl.cam.ac.uk>2004-11-02 21:00:50 +0000
committerkaf24@freefall.cl.cam.ac.uk <kaf24@freefall.cl.cam.ac.uk>2004-11-02 21:00:50 +0000
commitb37cf37288acf290431f9a7f8b1c6b91a1020540 (patch)
treed53c290a246d861caf7537eb5afd152f4b55fc8e /Makefile
parentf35b12f0e2fb1d1e4f01a7cdb732e3192302c4ec (diff)
downloadxen-b37cf37288acf290431f9a7f8b1c6b91a1020540.tar.gz
xen-b37cf37288acf290431f9a7f8b1c6b91a1020540.tar.bz2
xen-b37cf37288acf290431f9a7f8b1c6b91a1020540.zip
bitkeeper revision 1.1159.1.340 (4187f582gn4AZ67FyEzNonoTpbod3w)
Fix 'make dist' so that it creates a dist/ directory suitable for turning into a binary-only distribution tarball.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 9 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index d357cebf63..aac39d5498 100644
--- a/Makefile
+++ b/Makefile
@@ -2,13 +2,14 @@
# Grand Unified Makefile for Xen.
#
-INSTALL_DIR ?= $(shell pwd)/install
+DIST_DIR ?= $(shell pwd)/dist
+INSTALL_DIR ?= $(DIST_DIR)/install
SOURCEFORGE_MIRROR := http://heanet.dl.sourceforge.net/sourceforge
#http://voxel.dl.sourceforge.net/sourceforge/
#http://easynews.dl.sourceforge.net/sourceforge
-.PHONY: docs delete-symlinks clean
+.PHONY: docs delete-symlinks clean all install dist
# a not partcularly useful but safe default target
all:
@@ -22,13 +23,16 @@ install: dist
$(MAKE) -C xen install
$(MAKE) -C tools install
sh ./docs/check_pkgs && $(MAKE) -C docs install
- $(shell cp -dR install/boot/*$(LINUX_VER)* /boot/)
- $(shell cp -dR install/lib/modules/* /lib/modules/)
+ $(shell cp -dR $(INSTALL_DIR)/boot/*$(LINUX_VER)* $(prefix)/boot/)
+ $(shell cp -dR $(INSTALL_DIR)/lib/modules/* $(prefix)/lib/modules/)
# install xen and tools into the install directory
dist: all
$(MAKE) linux-xenU
$(MAKE) linux-xen0
+ install -m0644 ./COPYING $(DIST_DIR)
+ install -m0644 ./README $(DIST_DIR)
+ install -m0755 ./install.sh $(DIST_DIR)
LINUX_RELEASE ?= 2.6
LINUX_VER ?= $(shell ( /bin/ls -ld linux-$(LINUX_RELEASE).*-xen-sparse ) 2>/dev/null | \
@@ -202,7 +206,7 @@ clean:
# clean, but blow away linux build tree plus src tar ball
mrproper: clean
- rm -rf install/* patches $(LINUX_TREES) linux-$(LINUX_VER).tar.*
+ rm -rf dist patches $(LINUX_TREES) linux-$(LINUX_VER).tar.*
install-twisted:
wget http://www.twistedmatrix.com/products/get-current.epy