diff options
| author | iap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk> | 2005-01-22 22:05:19 +0000 |
|---|---|---|
| committer | iap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk> | 2005-01-22 22:05:19 +0000 |
| commit | feebe377b8dae7c5aae0900f0d9007f9366f47f2 (patch) | |
| tree | 369af649da22f3617a288c9768a46fe44df088d5 | |
| parent | d2f5d53621f141ce1be63eeeae4a8a9e289498d8 (diff) | |
| download | xen-feebe377b8dae7c5aae0900f0d9007f9366f47f2.tar.gz xen-feebe377b8dae7c5aae0900f0d9007f9366f47f2.tar.bz2 xen-feebe377b8dae7c5aae0900f0d9007f9366f47f2.zip | |
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
| -rw-r--r-- | Makefile | 16 | ||||
| -rw-r--r-- | tools/Makefile | 2 |
2 files changed, 9 insertions, 9 deletions
@@ -40,7 +40,8 @@ kernels.install: cp -dR $(INSTALL_DIR)/lib/modules/* $(prefix)/lib/modules/ docs.install: - sh ./docs/check_pkgs && $(MAKE) -C docs install || true + sh ./docs/check_pkgs + -$(MAKE) -C docs install xen.install tools.install: %.install: $(MAKE) -C $* install @@ -65,8 +66,8 @@ tools: kernels: $(addsuffix -build,$(XKERNELS)) docs: - sh ./docs/check_pkgs && \ - $(MAKE) prefix=$(INSTALL_DIR) dist=yes -C docs install || true + sh ./docs/check_pkgs + -$(MAKE) dist=yes -C docs install # Build all the various kernels and modules kbuild: kernels @@ -101,20 +102,19 @@ mrproper: clean $(addsuffix -delete,$(ALLKERNELS)) $(addsuffix -mrproper,$(ALLSP install-twisted: wget http://www.twistedmatrix.com/products/get-current.epy tar -zxf Twisted-*.tar.gz - ( cd Twisted-* ; python setup.py install ) + cd Twisted-* && python setup.py install install-logging: LOGGING=logging-0.4.9.2 install-logging: [ -f $(LOGGING).tar.gz ] || wget http://www.red-dove.com/$(LOGGING).tar.gz tar -zxf $(LOGGING).tar.gz - ( cd $(LOGGING) && python setup.py install ) + cd $(LOGGING) && python setup.py install # handy target to upgrade iptables (use rpm or apt-get in preference) install-iptables: wget http://www.netfilter.org/files/iptables-1.2.11.tar.bz2 - tar -jxf iptables-*.tar.bz2 - ( cd iptables-* ; \ - make PREFIX= KERNEL_DIR=../linux-$(LINUX_VER)-xen0 install) + tar -jxf iptables-1.2.11.tar.bz2 + $(MAKE) -C iptables-1.2.11 PREFIX= KERNEL_DIR=../linux-$(LINUX_VER)-xen0 install help: @echo 'Installation targets:' diff --git a/tools/Makefile b/tools/Makefile index 6c9855bed7..a05c196d37 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -23,7 +23,7 @@ endif $(MAKE) -C sv install dist: $(TARGET) - $(MAKE) prefix=`pwd`/../../install dist=yes install + $(MAKE) prefix=$(CURDIR)/../../install dist=yes install clean: |