From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eduardo Habkost Subject: [PATCH 1/3] kvm: qemu: don't fail building when pc-bios dir is empty Date: Fri, 23 Jan 2009 16:41:33 -0200 Message-ID: <1232736095-26244-2-git-send-email-ehabkost@redhat.com> References: <1232736095-26244-1-git-send-email-ehabkost@redhat.com> Cc: kvm@vger.kernel.org, Eduardo Habkost To: Avi Kivity Return-path: Received: from mx2.redhat.com ([66.187.237.31]:37027 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754400AbZAWSlz (ORCPT ); Fri, 23 Jan 2009 13:41:55 -0500 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n0NIfsXa007848 for ; Fri, 23 Jan 2009 13:41:54 -0500 In-Reply-To: <1232736095-26244-1-git-send-email-ehabkost@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: 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. This patch also applies to the maint/2.6.29 branch. Signed-off-by: Eduardo Habkost --- qemu/Makefile | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/qemu/Makefile b/qemu/Makefile index 648b849..fe675a9 100644 --- a/qemu/Makefile +++ b/qemu/Makefile @@ -242,8 +242,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