aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorblueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>2008-03-05 18:16:09 +0000
committerblueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>2008-03-05 18:16:09 +0000
commit18be8d775ed991816634b85aba90da1ead663c67 (patch)
treecd0b0416498a574a5cde2157e589b52d0f0c486e
parent375ee38b4ba6c2c640a77253ffadcdcea5d76002 (diff)
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
-rw-r--r--Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 7501944b9a..c36a97812a 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)