diff options
| author | iap10@tetris.cl.cam.ac.uk <iap10@tetris.cl.cam.ac.uk> | 2005-01-25 15:37:49 +0000 |
|---|---|---|
| committer | iap10@tetris.cl.cam.ac.uk <iap10@tetris.cl.cam.ac.uk> | 2005-01-25 15:37:49 +0000 |
| commit | 201fb48f0920e7d9cfd7d84ad03d85a23ef92fdd (patch) | |
| tree | 3637ff3adcc6b26dfadec37355be2ee3b03fc5f2 /buildconfigs | |
| parent | fe59039ac0b2d2bf8bcc2d4718e2461817544aeb (diff) | |
| download | xen-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 'buildconfigs')
| -rw-r--r-- | buildconfigs/Rules.mk | 4 | ||||
| -rw-r--r-- | buildconfigs/mk.linux-2.4-xen0 | 4 | ||||
| -rw-r--r-- | buildconfigs/mk.linux-2.4-xenU | 4 | ||||
| -rw-r--r-- | buildconfigs/mk.linux-2.6-xen0 | 4 | ||||
| -rw-r--r-- | buildconfigs/mk.linux-2.6-xenU | 4 | ||||
| -rw-r--r-- | buildconfigs/mk.netbsd-2.0-xenU | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/buildconfigs/Rules.mk b/buildconfigs/Rules.mk index e2bd054473..cdb6b096e2 100644 --- a/buildconfigs/Rules.mk +++ b/buildconfigs/Rules.mk @@ -1,8 +1,8 @@ # We expect these two to already be set if people # are using the top-level Makefile -DIST_DIR ?= $(shell pwd)/dist -INSTALL_DIR ?= $(DIST_DIR)/install +DISTDIR ?= $(CURDIR)/dist +DESTDIR ?= $(DISTDIR)/install .PHONY: mkpatches mrproper diff --git a/buildconfigs/mk.linux-2.4-xen0 b/buildconfigs/mk.linux-2.4-xen0 index c4f7fc359a..be21fc5ec3 100644 --- a/buildconfigs/mk.linux-2.4-xen0 +++ b/buildconfigs/mk.linux-2.4-xen0 @@ -37,8 +37,8 @@ $(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER) # add ebtables patch ( cd $(LINUX_DIR) ; patch -p1 -F3 < ../patches/tmp/ebtables.diff ) # Re-use config from install dir if one exits else use default config - [ -r $(INSTALL_DIR)/boot/config-$(FULLVERSION) ] && \ - cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \ + [ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \ + cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \ || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \ $(LINUX_DIR)/.config make -C $(LINUX_DIR) ARCH=xen oldconfig diff --git a/buildconfigs/mk.linux-2.4-xenU b/buildconfigs/mk.linux-2.4-xenU index 1c589faba2..26563c11e6 100644 --- a/buildconfigs/mk.linux-2.4-xenU +++ b/buildconfigs/mk.linux-2.4-xenU @@ -30,8 +30,8 @@ $(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER) sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \ rm -f Makefile ; mv Mk.tmp Makefile ) # Re-use config from install dir if one exits else use default config - [ -r $(INSTALL_DIR)/boot/config-$(FULLVERSION) ] && \ - cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \ + [ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \ + cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \ || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \ $(LINUX_DIR)/.config make -C $(LINUX_DIR) ARCH=xen oldconfig diff --git a/buildconfigs/mk.linux-2.6-xen0 b/buildconfigs/mk.linux-2.6-xen0 index eda5bb46d8..f4310f5925 100644 --- a/buildconfigs/mk.linux-2.6-xen0 +++ b/buildconfigs/mk.linux-2.6-xen0 @@ -30,8 +30,8 @@ $(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER) sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \ rm -f Makefile ; mv Mk.tmp Makefile ) # Re-use config from install dir if one exits else use default config - [ -r $(INSTALL_DIR)/boot/config-$(FULLVERSION) ] && \ - cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \ + [ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \ + cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \ || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \ $(LINUX_DIR)/.config make -C $(LINUX_DIR) ARCH=xen oldconfig diff --git a/buildconfigs/mk.linux-2.6-xenU b/buildconfigs/mk.linux-2.6-xenU index ff6b47ff29..79a3d66777 100644 --- a/buildconfigs/mk.linux-2.6-xenU +++ b/buildconfigs/mk.linux-2.6-xenU @@ -30,8 +30,8 @@ $(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER) sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \ rm -f Makefile ; mv Mk.tmp Makefile ) # Re-use config from install dir if one exits else use default config - [ -r $(INSTALL_DIR)/boot/config-$(FULLVERSION) ] && \ - cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \ + [ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \ + cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \ || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \ $(LINUX_DIR)/.config make -C $(LINUX_DIR) ARCH=xen oldconfig diff --git a/buildconfigs/mk.netbsd-2.0-xenU b/buildconfigs/mk.netbsd-2.0-xenU index 55a802f143..acd7e5801a 100644 --- a/buildconfigs/mk.netbsd-2.0-xenU +++ b/buildconfigs/mk.netbsd-2.0-xenU @@ -34,7 +34,7 @@ $(NETBSD_DIR)/.valid: pristine-netbsd-$(NETBSD_VER) netbsd-xen%: $(NETBSD_DIR)/.valid netbsd-$(NETBSD_RELEASE)-tools $(MAKE) -C netbsd-$(FULLVERSION) config $(MAKE) -C netbsd-$(FULLVERSION) netbsd - $(MAKE) -C netbsd-$(FULLVERSION) INSTALL_PATH=$(INSTALL_DIR) INSTALL_NAME=boot/netbsd-$(NETBSD_VER)-xen$* install + $(MAKE) -C netbsd-$(FULLVERSION) INSTALL_PATH=$(DESTDIR) INSTALL_NAME=boot/netbsd-$(NETBSD_VER)-xen$* install clean: $(MAKE) -C netbsd-$(FULLVERSION) clean |