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,14 +193,14 @@ ifneq ($(TOOLS),) | ||
| 193 | $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)" | 193 | $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)" |
| 194 | endif | 194 | endif |
| 195 | mkdir -p "$(DESTDIR)$(datadir)" | 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 | video.x openbios-sparc32 pxe-ne2k_pci.bin \ | 197 | video.x openbios-sparc32 pxe-ne2k_pci.bin \ |
| 198 | pxe-rtl8139.bin pxe-pcnet.bin; do \ | 198 | pxe-rtl8139.bin pxe-pcnet.bin; do \ |
| 199 | $(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \ | 199 | $(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \ |
| 200 | done | 200 | done |
| 201 | ifndef CONFIG_WIN32 | 201 | ifndef CONFIG_WIN32 |
| 202 | mkdir -p "$(DESTDIR)$(datadir)/keymaps" | 202 | mkdir -p "$(DESTDIR)$(datadir)/keymaps" |
| 203 | - for x in $(KEYMAPS); do \ | 203 | + set -e; for x in $(KEYMAPS); do \ |
| 204 | $(INSTALL) -m 644 $(SRC_PATH)/keymaps/$$x "$(DESTDIR)$(datadir)/keymaps"; \ | 204 | $(INSTALL) -m 644 $(SRC_PATH)/keymaps/$$x "$(DESTDIR)$(datadir)/keymaps"; \ |
| 205 | done | 205 | done |
| 206 | endif | 206 | endif |
| @@ -251,12 +251,12 @@ FILE = qemu-$(VERSION) | @@ -251,12 +251,12 @@ FILE = qemu-$(VERSION) | ||
| 251 | tar: | 251 | tar: |
| 252 | rm -rf /tmp/$(FILE) | 252 | rm -rf /tmp/$(FILE) |
| 253 | cp -r . /tmp/$(FILE) | 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 | rm -rf /tmp/$(FILE) | 255 | rm -rf /tmp/$(FILE) |
| 256 | 256 | ||
| 257 | # generate a binary distribution | 257 | # generate a binary distribution |
| 258 | tarbin: | 258 | tarbin: |
| 259 | - ( cd / ; tar zcvf ~/qemu-$(VERSION)-$(ARCH).tar.gz \ | 259 | + cd / && tar zcvf ~/qemu-$(VERSION)-$(ARCH).tar.gz \ |
| 260 | $(bindir)/qemu \ | 260 | $(bindir)/qemu \ |
| 261 | $(bindir)/qemu-system-ppc \ | 261 | $(bindir)/qemu-system-ppc \ |
| 262 | $(bindir)/qemu-system-ppc64 \ | 262 | $(bindir)/qemu-system-ppc64 \ |
| @@ -301,7 +301,7 @@ tarbin: | @@ -301,7 +301,7 @@ tarbin: | ||
| 301 | $(datadir)/pxe-pcnet.bin \ | 301 | $(datadir)/pxe-pcnet.bin \ |
| 302 | $(docdir)/qemu-doc.html \ | 302 | $(docdir)/qemu-doc.html \ |
| 303 | $(docdir)/qemu-tech.html \ | 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 | # Include automatically generated dependency files | 306 | # Include automatically generated dependency files |
| 307 | -include $(wildcard *.d audio/*.d slirp/*.d) | 307 | -include $(wildcard *.d audio/*.d slirp/*.d) |