[Qemu-devel] [PATCH] Properly bomb out on errors in Makefile shell fragments

[Ian Jackson]

Without `set -e', or the use of &&, errors in commands run from
Makefiles in multi-command fragments are not trapped.  ( ) are
redundant in multi-command shell fragments.

Ian.

diff --git a/Makefile b/Makefile
index d74aa6e..89c4bd6 100644
--- a/Makefile
+++ b/Makefile
@@ -193,14 +193,14 @@ ifneq ($(TOOLS),)
        $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)"
 endif
        mkdir -p "$(DESTDIR)$(datadir)"
-       for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \
+       set -e; for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \
                video.x openbios-sparc32 pxe-ne2k_pci.bin \
                pxe-rtl8139.bin pxe-pcnet.bin; do \
                $(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x 
"$(DESTDIR)$(datadir)"; \
        done
 ifndef CONFIG_WIN32
        mkdir -p "$(DESTDIR)$(datadir)/keymaps"
-       for x in $(KEYMAPS); do \
+       set -e; for x in $(KEYMAPS); do \
                $(INSTALL) -m 644 $(SRC_PATH)/keymaps/$$x 
"$(DESTDIR)$(datadir)/keymaps"; \
        done
 endif
@@ -251,12 +251,12 @@ FILE = qemu-$(VERSION)
 tar:
        rm -rf /tmp/$(FILE)
        cp -r . /tmp/$(FILE)
-       ( cd /tmp ; tar zcvf ~/$(FILE).tar.gz $(FILE) --exclude CVS )
+       cd /tmp && tar zcvf ~/$(FILE).tar.gz $(FILE) --exclude CVS
        rm -rf /tmp/$(FILE)
 
 # generate a binary distribution
 tarbin:
-       ( cd / ; tar zcvf ~/qemu-$(VERSION)-$(ARCH).tar.gz \
+       cd / && tar zcvf ~/qemu-$(VERSION)-$(ARCH).tar.gz \
        $(bindir)/qemu \
        $(bindir)/qemu-system-ppc \
        $(bindir)/qemu-system-ppc64 \
@@ -301,7 +301,7 @@ tarbin:
         $(datadir)/pxe-pcnet.bin \
        $(docdir)/qemu-doc.html \
        $(docdir)/qemu-tech.html \
-       $(mandir)/man1/qemu.1 $(mandir)/man1/qemu-img.1 )
+       $(mandir)/man1/qemu.1 $(mandir)/man1/qemu-img.1
 
 # Include automatically generated dependency files
 -include $(wildcard *.d audio/*.d slirp/*.d)