aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoriap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk>2005-01-25 13:08:25 +0000
committeriap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk>2005-01-25 13:08:25 +0000
commit5554ef5b7458559339472a9758a309cb77e18256 (patch)
tree554da447e49a060b5eb6a177ed39b0760378c1eb
parent1ac07367bb077785c1ecb6f8d3ab27d79ff73f17 (diff)
parent05dec242c352a08f908d713396f11327eccf9549 (diff)
downloadxen-5554ef5b7458559339472a9758a309cb77e18256.tar.gz
xen-5554ef5b7458559339472a9758a309cb77e18256.tar.bz2
xen-5554ef5b7458559339472a9758a309cb77e18256.zip
bitkeeper revision 1.1159.223.36 (41f644c9famqz8rwdr0g7NzC9KVv3g)
Merge freefall.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-2.0-testing.bk
-rw-r--r--Makefile6
-rw-r--r--tools/Makefile2
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 924fbfbaca..8e2988dc08 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ INSTALL_DIR := $(INSTALL) -d -m0755
INSTALL_DATA := $(INSTALL) -m0644
INSTALL_PROG := $(INSTALL) -m0755
-KERNELS ?= linux-2.6-xen0 linux-2.6-xenU
+KERNELS ?= linux-2.6-xen0 linux-2.6-xenU linux-2.4-xen0 linux-2.4-xenU netbsd-2.0-xenU
# linux-2.4-xen0 linux-2.4-xenU netbsd-2.0-xenU
# You may use wildcards in the above e.g. KERNELS=*2.4*
@@ -65,7 +65,7 @@ tools:
$(MAKE) dist=yes -C tools install
kernels:
- for i in $(XKERNELS) ; do $(MAKE) $$i-build ; done
+ for i in $(XKERNELS) ; do $(MAKE) $$i-build || exit 1; done
docs:
sh ./docs/check_pkgs
@@ -84,7 +84,7 @@ kclean:
# Make patches from kernel sparse trees
mkpatches:
- for i in $(ALLSPARSETREES) ; do $(MAKE) $$i-xen.patch ; done
+ for i in $(ALLSPARSETREES) ; do $(MAKE) $$i-xen.patch || exit 1; done
# build xen, the tools, and a domain 0 plus unprivileged linux-xen images,
diff --git a/tools/Makefile b/tools/Makefile
index a05c196d37..722f9d9f7d 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -23,7 +23,7 @@ endif
$(MAKE) -C sv install
dist: $(TARGET)
- $(MAKE) prefix=$(CURDIR)/../../install dist=yes install
+ $(MAKE) prefix=$(CURDIR)/../dist/install dist=yes install
clean: