ia64/xen-unstable

changeset 3534:ae14fa1d3691

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
author iap10@tetris.cl.cam.ac.uk
date Tue Jan 25 15:37:49 2005 +0000 (2005-01-25)
parents dee91b44a753
children 8b969ff555c1 dfc199315add
files Makefile buildconfigs/Rules.mk buildconfigs/mk.linux-2.4-xen0 buildconfigs/mk.linux-2.4-xenU buildconfigs/mk.linux-2.6-xen0 buildconfigs/mk.linux-2.6-xenU buildconfigs/mk.netbsd-2.0-xenU
line diff
     1.1 --- a/Makefile	Tue Jan 25 14:05:48 2005 +0000
     1.2 +++ b/Makefile	Tue Jan 25 15:37:49 2005 +0000
     1.3 @@ -2,8 +2,8 @@
     1.4  # Grand Unified Makefile for Xen.
     1.5  #
     1.6  
     1.7 -DIST_DIR	:= $(CURDIR)/dist
     1.8 -DESTDIR		:= $(DIST_DIR)/install
     1.9 +DISTDIR		?= $(CURDIR)/dist
    1.10 +DESTDIR		?= $(DISTDIR)/install
    1.11  
    1.12  INSTALL		:= install
    1.13  INSTALL_DIR	:= $(INSTALL) -d -m0755
    1.14 @@ -40,10 +40,10 @@ install-tools:
    1.15  	$(MAKE) -C tools install
    1.16  
    1.17  install-kernels:
    1.18 -	cp -a $(INSTALL_DIR)/boot/* /boot/
    1.19 -	cp -a $(INSTALL_DIR)/lib/modules/* /lib/modules/
    1.20 -	cp -dR $(INSTALL_DIR)/boot/*$(LINUX_VER)* $(prefix)/boot/
    1.21 -	cp -dR $(INSTALL_DIR)/lib/modules/* $(prefix)/lib/modules/
    1.22 +	cp -a $(DESTDIR)/boot/* /boot/
    1.23 +	cp -a $(DESTDIR)/lib/modules/* /lib/modules/
    1.24 +	cp -dR $(DESTDIR)/boot/*$(LINUX_VER)* $(prefix)/boot/
    1.25 +	cp -dR $(DESTDIR)/lib/modules/* $(prefix)/lib/modules/
    1.26  
    1.27  install-docs:
    1.28  	sh ./docs/check_pkgs && $(MAKE) -C docs install || true
    1.29 @@ -52,11 +52,11 @@ install-docs:
    1.30  
    1.31  # build and install everything into local dist directory
    1.32  dist: xen tools kernels docs
    1.33 -	$(INSTALL_DIR) $(DIST_DIR)/check
    1.34 -	$(INSTALL_DATA) ./COPYING $(DIST_DIR)
    1.35 -	$(INSTALL_DATA) ./README $(DIST_DIR)
    1.36 -	$(INSTALL_PROG) ./install.sh $(DIST_DIR)
    1.37 -	$(INSTALL_PROG) tools/check/chk tools/check/check_* $(DIST_DIR)/check
    1.38 +	$(INSTALL_DIR) $(DISTDIR)/check
    1.39 +	$(INSTALL_DATA) ./COPYING $(DISTDIR)
    1.40 +	$(INSTALL_DATA) ./README $(DISTDIR)
    1.41 +	$(INSTALL_PROG) ./install.sh $(DISTDIR)
    1.42 +	$(INSTALL_PROG) tools/check/chk tools/check/check_* $(DISTDIR)/check
    1.43  
    1.44  xen:
    1.45  	$(MAKE) dist=yes -C xen install
     2.1 --- a/buildconfigs/Rules.mk	Tue Jan 25 14:05:48 2005 +0000
     2.2 +++ b/buildconfigs/Rules.mk	Tue Jan 25 15:37:49 2005 +0000
     2.3 @@ -1,8 +1,8 @@
     2.4  
     2.5  # We expect these two to already be set if people 
     2.6  # are using the top-level Makefile
     2.7 -DIST_DIR	?= $(shell pwd)/dist
     2.8 -INSTALL_DIR	?= $(DIST_DIR)/install
     2.9 +DISTDIR	?= $(CURDIR)/dist
    2.10 +DESTDIR	?= $(DISTDIR)/install
    2.11  
    2.12  .PHONY:	mkpatches mrproper
    2.13  
     3.1 --- a/buildconfigs/mk.linux-2.4-xen0	Tue Jan 25 14:05:48 2005 +0000
     3.2 +++ b/buildconfigs/mk.linux-2.4-xen0	Tue Jan 25 15:37:49 2005 +0000
     3.3 @@ -37,8 +37,8 @@ patches/tmp/ebtables.diff:
     3.4  	# add ebtables patch
     3.5  	( cd $(LINUX_DIR) ; patch -p1 -F3 < ../patches/tmp/ebtables.diff )
     3.6  	# Re-use config from install dir if one exits else use default config
     3.7 -	[ -r $(INSTALL_DIR)/boot/config-$(FULLVERSION) ] && \
     3.8 -	  cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
     3.9 +	[ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \
    3.10 +	  cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
    3.11  	  || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \
    3.12  		$(LINUX_DIR)/.config
    3.13  	make -C $(LINUX_DIR) ARCH=xen oldconfig
     4.1 --- a/buildconfigs/mk.linux-2.4-xenU	Tue Jan 25 14:05:48 2005 +0000
     4.2 +++ b/buildconfigs/mk.linux-2.4-xenU	Tue Jan 25 15:37:49 2005 +0000
     4.3 @@ -30,8 +30,8 @@ build: $(LINUX_DIR)/include/linux/autoco
     4.4  	  sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
     4.5  	  rm -f Makefile ; mv Mk.tmp Makefile )
     4.6  	# Re-use config from install dir if one exits else use default config
     4.7 -	[ -r $(INSTALL_DIR)/boot/config-$(FULLVERSION) ] && \
     4.8 -	  cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
     4.9 +	[ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \
    4.10 +	  cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
    4.11  	  || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \
    4.12  		$(LINUX_DIR)/.config
    4.13  	make -C $(LINUX_DIR) ARCH=xen oldconfig
     5.1 --- a/buildconfigs/mk.linux-2.6-xen0	Tue Jan 25 14:05:48 2005 +0000
     5.2 +++ b/buildconfigs/mk.linux-2.6-xen0	Tue Jan 25 15:37:49 2005 +0000
     5.3 @@ -30,8 +30,8 @@ build: $(LINUX_DIR)/include/linux/autoco
     5.4  	  sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
     5.5  	  rm -f Makefile ; mv Mk.tmp Makefile )
     5.6  	# Re-use config from install dir if one exits else use default config
     5.7 -	[ -r $(INSTALL_DIR)/boot/config-$(FULLVERSION) ] && \
     5.8 -	  cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
     5.9 +	[ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \
    5.10 +	  cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
    5.11  	  || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \
    5.12  		$(LINUX_DIR)/.config
    5.13  	make -C $(LINUX_DIR) ARCH=xen oldconfig
     6.1 --- a/buildconfigs/mk.linux-2.6-xenU	Tue Jan 25 14:05:48 2005 +0000
     6.2 +++ b/buildconfigs/mk.linux-2.6-xenU	Tue Jan 25 15:37:49 2005 +0000
     6.3 @@ -30,8 +30,8 @@ build: $(LINUX_DIR)/include/linux/autoco
     6.4  	  sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
     6.5  	  rm -f Makefile ; mv Mk.tmp Makefile )
     6.6  	# Re-use config from install dir if one exits else use default config
     6.7 -	[ -r $(INSTALL_DIR)/boot/config-$(FULLVERSION) ] && \
     6.8 -	  cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
     6.9 +	[ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \
    6.10 +	  cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
    6.11  	  || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \
    6.12  		$(LINUX_DIR)/.config
    6.13  	make -C $(LINUX_DIR) ARCH=xen oldconfig
     7.1 --- a/buildconfigs/mk.netbsd-2.0-xenU	Tue Jan 25 14:05:48 2005 +0000
     7.2 +++ b/buildconfigs/mk.netbsd-2.0-xenU	Tue Jan 25 15:37:49 2005 +0000
     7.3 @@ -34,7 +34,7 @@ netbsd-%-tools: netbsd-%-tools.tar.bz2
     7.4  netbsd-xen%: $(NETBSD_DIR)/.valid netbsd-$(NETBSD_RELEASE)-tools
     7.5  	$(MAKE) -C netbsd-$(FULLVERSION) config
     7.6  	$(MAKE) -C netbsd-$(FULLVERSION) netbsd
     7.7 -	$(MAKE) -C netbsd-$(FULLVERSION) INSTALL_PATH=$(INSTALL_DIR) INSTALL_NAME=boot/netbsd-$(NETBSD_VER)-xen$* install
     7.8 +	$(MAKE) -C netbsd-$(FULLVERSION) INSTALL_PATH=$(DESTDIR) INSTALL_NAME=boot/netbsd-$(NETBSD_VER)-xen$* install
     7.9  
    7.10  clean:
    7.11  	$(MAKE) -C netbsd-$(FULLVERSION) clean