Sophie

Sophie

distrib > Scientific%20Linux > 5x > x86_64 > media > main-src > by-pkgid > aadbe78a25743146bb784eee19f007c5 > files > 15

kvm-83-164.el5_5.9.src.rpm

From c6d4373a220a217d47152de5e87f56577830e24d Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost@redhat.com>
Date: Wed, 7 Jan 2009 20:38:33 -0200
Subject: [PATCH 14/54] kvm: qemu: don't fail building when pc-bios dir is empty

The '[ -f "$file" ] && install' command will make the return code
of the command to be non-zero, making 'make' abort. Use shell 'if'
construct instead.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
RH-Type: bugfix(build)
RH-Upstream-status: submitted(kvm-devel)
---
 qemu/Makefile |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/qemu/Makefile b/qemu/Makefile
index f277379..6f6bfd7 100644
--- a/qemu/Makefile
+++ b/qemu/Makefile
@@ -262,8 +262,9 @@ endif
 ifneq ($(BLOBS),)
 	mkdir -p "$(DESTDIR)$(datadir)"
 	set -e; for x in $(BLOBS); do \
-		[ -f $(SRC_PATH)/pc-bios/$$x ] && \
-		$(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \
+		if [ -f $(SRC_PATH)/pc-bios/$$x ];then \
+			$(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \
+		fi \
 	done
 endif
 ifndef CONFIG_WIN32
-- 
1.6.1