ia64/xen-unstable

changeset 3500:ef59de03bebf

bitkeeper revision 1.1159.223.27 (41f2ce1fr2yuEH_MHLrdXsDbSjsMJA)

Description: fix non-standard make/shell syntax
Fix use of `pwd`, &&, and || true. Also, remove ().

From: Adam Heath <doogie@brainfood.com>
Signed-off-by: ian.pratt@cl.cam.ac.uk
author iap10@labyrinth.cl.cam.ac.uk
date Sat Jan 22 22:05:19 2005 +0000 (2005-01-22)
parents 78b5439ce414
children 502b0127031e
files Makefile tools/Makefile
line diff
     1.1 --- a/Makefile	Sat Jan 22 22:03:34 2005 +0000
     1.2 +++ b/Makefile	Sat Jan 22 22:05:19 2005 +0000
     1.3 @@ -40,7 +40,8 @@ kernels.install:
     1.4  	cp -dR $(INSTALL_DIR)/lib/modules/* $(prefix)/lib/modules/
     1.5  
     1.6  docs.install:
     1.7 -	sh ./docs/check_pkgs &&	$(MAKE) -C docs install || true
     1.8 +	sh ./docs/check_pkgs
     1.9 +	-$(MAKE) -C docs install
    1.10  
    1.11  xen.install tools.install: %.install:
    1.12  	$(MAKE) -C $* install
    1.13 @@ -65,8 +66,8 @@ tools:
    1.14  kernels: $(addsuffix -build,$(XKERNELS))
    1.15  
    1.16  docs:
    1.17 -	sh ./docs/check_pkgs && \
    1.18 -		$(MAKE) prefix=$(INSTALL_DIR) dist=yes -C docs install || true
    1.19 +	sh ./docs/check_pkgs
    1.20 +	-$(MAKE) dist=yes -C docs install
    1.21  
    1.22  # Build all the various kernels and modules
    1.23  kbuild: kernels
    1.24 @@ -101,20 +102,19 @@ mrproper: clean $(addsuffix -delete,$(AL
    1.25  install-twisted:
    1.26  	wget http://www.twistedmatrix.com/products/get-current.epy
    1.27  	tar -zxf Twisted-*.tar.gz
    1.28 -	( cd Twisted-* ; python setup.py install )
    1.29 +	cd Twisted-* && python setup.py install
    1.30  
    1.31  install-logging: LOGGING=logging-0.4.9.2
    1.32  install-logging:
    1.33  	[ -f $(LOGGING).tar.gz ] || wget http://www.red-dove.com/$(LOGGING).tar.gz
    1.34  	tar -zxf $(LOGGING).tar.gz
    1.35 -	( cd $(LOGGING) && python setup.py install )
    1.36 +	cd $(LOGGING) && python setup.py install
    1.37  
    1.38  # handy target to upgrade iptables (use rpm or apt-get in preference)
    1.39  install-iptables:
    1.40  	wget http://www.netfilter.org/files/iptables-1.2.11.tar.bz2
    1.41 -	tar -jxf iptables-*.tar.bz2
    1.42 -	( cd iptables-* ; \
    1.43 -	  make PREFIX= KERNEL_DIR=../linux-$(LINUX_VER)-xen0 install)
    1.44 +	tar -jxf iptables-1.2.11.tar.bz2
    1.45 +	$(MAKE) -C iptables-1.2.11 PREFIX= KERNEL_DIR=../linux-$(LINUX_VER)-xen0 install
    1.46  
    1.47  help:
    1.48  	@echo 'Installation targets:'
     2.1 --- a/tools/Makefile	Sat Jan 22 22:03:34 2005 +0000
     2.2 +++ b/tools/Makefile	Sat Jan 22 22:05:19 2005 +0000
     2.3 @@ -23,7 +23,7 @@ endif
     2.4  	$(MAKE) -C sv install
     2.5  
     2.6  dist: $(TARGET)
     2.7 -	$(MAKE) prefix=`pwd`/../../install dist=yes install
     2.8 +	$(MAKE) prefix=$(CURDIR)/../../install dist=yes install
     2.9  
    2.10  
    2.11  clean: