Skip to content

Commit

Permalink
Properly bomb out on errors in Makefile shell fragments (Ian Jackson)
Browse files Browse the repository at this point in the history
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4019 c046a42c-6fe2-441c-8c8c-71466251a162
  • Loading branch information
blueswir1 committed Mar 5, 2008
1 parent 375ee38 commit 18be8d7
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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)

0 comments on commit 18be8d7

Please sign in to comment.