diff options
| -rw-r--r-- | Makefile | 22 | ||||
| -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 |
7 files changed, 22 insertions, 22 deletions
@@ -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 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 |