mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Properly bomb out on errors in Makefile shell fragments (Ian Jackson)

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4019 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
blueswir1 2008-03-05 18:16:09 +00:00
parent 375ee38b4b
commit 18be8d775e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -193,14 +193,14 @@ ifneq ($(TOOLS),)
$(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)" $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)"
endif endif
mkdir -p "$(DESTDIR)$(datadir)" 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 \ video.x openbios-sparc32 pxe-ne2k_pci.bin \
pxe-rtl8139.bin pxe-pcnet.bin; do \ pxe-rtl8139.bin pxe-pcnet.bin; do \
$(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \ $(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \
done done
ifndef CONFIG_WIN32 ifndef CONFIG_WIN32
mkdir -p "$(DESTDIR)$(datadir)/keymaps" 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"; \ $(INSTALL) -m 644 $(SRC_PATH)/keymaps/$$x "$(DESTDIR)$(datadir)/keymaps"; \
done done
endif endif
@ -251,12 +251,12 @@ FILE = qemu-$(VERSION)
tar: tar:
rm -rf /tmp/$(FILE) rm -rf /tmp/$(FILE)
cp -r . /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) rm -rf /tmp/$(FILE)
# generate a binary distribution # generate a binary distribution
tarbin: tarbin:
( cd / ; tar zcvf ~/qemu-$(VERSION)-$(ARCH).tar.gz \ cd / && tar zcvf ~/qemu-$(VERSION)-$(ARCH).tar.gz \
$(bindir)/qemu \ $(bindir)/qemu \
$(bindir)/qemu-system-ppc \ $(bindir)/qemu-system-ppc \
$(bindir)/qemu-system-ppc64 \ $(bindir)/qemu-system-ppc64 \
@ -301,7 +301,7 @@ tarbin:
$(datadir)/pxe-pcnet.bin \ $(datadir)/pxe-pcnet.bin \
$(docdir)/qemu-doc.html \ $(docdir)/qemu-doc.html \
$(docdir)/qemu-tech.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 automatically generated dependency files
-include $(wildcard *.d audio/*.d slirp/*.d) -include $(wildcard *.d audio/*.d slirp/*.d)