Commit 18be8d775ed991816634b85aba90da1ead663c67
1 parent
375ee38b
Properly bomb out on errors in Makefile shell fragments (Ian Jackson)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4019 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
5 additions
and
5 deletions
Makefile
| ... | ... | @@ -193,14 +193,14 @@ ifneq ($(TOOLS),) |
| 193 | 193 | $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)" |
| 194 | 194 | endif |
| 195 | 195 | mkdir -p "$(DESTDIR)$(datadir)" |
| 196 | - for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \ | |
| 196 | + set -e; for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \ | |
| 197 | 197 | video.x openbios-sparc32 pxe-ne2k_pci.bin \ |
| 198 | 198 | pxe-rtl8139.bin pxe-pcnet.bin; do \ |
| 199 | 199 | $(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \ |
| 200 | 200 | done |
| 201 | 201 | ifndef CONFIG_WIN32 |
| 202 | 202 | mkdir -p "$(DESTDIR)$(datadir)/keymaps" |
| 203 | - for x in $(KEYMAPS); do \ | |
| 203 | + set -e; for x in $(KEYMAPS); do \ | |
| 204 | 204 | $(INSTALL) -m 644 $(SRC_PATH)/keymaps/$$x "$(DESTDIR)$(datadir)/keymaps"; \ |
| 205 | 205 | done |
| 206 | 206 | endif |
| ... | ... | @@ -251,12 +251,12 @@ FILE = qemu-$(VERSION) |
| 251 | 251 | tar: |
| 252 | 252 | rm -rf /tmp/$(FILE) |
| 253 | 253 | cp -r . /tmp/$(FILE) |
| 254 | - ( cd /tmp ; tar zcvf ~/$(FILE).tar.gz $(FILE) --exclude CVS ) | |
| 254 | + cd /tmp && tar zcvf ~/$(FILE).tar.gz $(FILE) --exclude CVS | |
| 255 | 255 | rm -rf /tmp/$(FILE) |
| 256 | 256 | |
| 257 | 257 | # generate a binary distribution |
| 258 | 258 | tarbin: |
| 259 | - ( cd / ; tar zcvf ~/qemu-$(VERSION)-$(ARCH).tar.gz \ | |
| 259 | + cd / && tar zcvf ~/qemu-$(VERSION)-$(ARCH).tar.gz \ | |
| 260 | 260 | $(bindir)/qemu \ |
| 261 | 261 | $(bindir)/qemu-system-ppc \ |
| 262 | 262 | $(bindir)/qemu-system-ppc64 \ |
| ... | ... | @@ -301,7 +301,7 @@ tarbin: |
| 301 | 301 | $(datadir)/pxe-pcnet.bin \ |
| 302 | 302 | $(docdir)/qemu-doc.html \ |
| 303 | 303 | $(docdir)/qemu-tech.html \ |
| 304 | - $(mandir)/man1/qemu.1 $(mandir)/man1/qemu-img.1 ) | |
| 304 | + $(mandir)/man1/qemu.1 $(mandir)/man1/qemu-img.1 | |
| 305 | 305 | |
| 306 | 306 | # Include automatically generated dependency files |
| 307 | 307 | -include $(wildcard *.d audio/*.d slirp/*.d) | ... | ... |