From patchwork Mon Dec 3 22:08:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 203448 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3AB572C00A5 for ; Tue, 4 Dec 2012 09:10:33 +1100 (EST) Received: from localhost ([::1]:38643 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TfeDf-0002lr-BE for incoming@patchwork.ozlabs.org; Mon, 03 Dec 2012 17:10:31 -0500 Received: from eggs.gnu.org ([208.118.235.92]:34953) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TfeDR-0002Y6-Rj for qemu-devel@nongnu.org; Mon, 03 Dec 2012 17:10:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TfeDN-0001Up-3g for qemu-devel@nongnu.org; Mon, 03 Dec 2012 17:10:17 -0500 Received: from mail-ie0-f182.google.com ([209.85.223.182]:60488) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TfeDK-0001Rm-LC; Mon, 03 Dec 2012 17:10:10 -0500 Received: by mail-ie0-f182.google.com with SMTP id s9so7869547iec.27 for ; Mon, 03 Dec 2012 14:10:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=Pi3XXXOfaJ+le1ZJfa7UE9+s/GOAHq57TQlBxnzeFss=; b=phTadVxl/DvCXK+CnMDAhJYekqYnVTTHAfqrS2o0mz4IPlhMImDVuHyooAjiFgr0lW iibEPKF5KK+CsrDZZJx69sJRyXMEuSU+2m9J2AsPJNexj9HshXto9zTBQ4PoZUbCrEgY m8T2yDIwYrTmDSV/qBknMr6ushMtsBYV0FntYu5H4JnniEt8yhCQpnPYrxbkKuhWjOlN bsetaCsCNY/QvryKCqDg3J4JAzW9GxVFPGXGbtCJCAwcRd5Tfow9xMFkmFwVwt/InqLy ccNr09e+a5+paLO4Qj+lJnzhGd3PqBFFvVEbDB5pKZMYom5Vd9iaHkMLVFIosSvlpbG7 N5Dw== Received: by 10.50.104.232 with SMTP id gh8mr567080igb.45.1354572609291; Mon, 03 Dec 2012 14:10:09 -0800 (PST) Received: from localhost ([32.97.110.59]) by mx.google.com with ESMTPS id wm10sm8168685igc.2.2012.12.03.14.10.08 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 03 Dec 2012 14:10:08 -0800 (PST) From: Michael Roth To: qemu-stable@nongnu.org Date: Mon, 3 Dec 2012 16:08:26 -0600 Message-Id: <1354572547-21271-3-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1354572547-21271-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1354572547-21271-1-git-send-email-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.223.182 Cc: aliguori@us.ibm.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 02/43] fix CONFIG_QEMU_HELPERDIR generation again X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Michael Tokarev commit 38f419f35225 fixed a breakage with CONFIG_QEMU_HELPERDIR which has been introduced by 8bf188aa18ef7a8. But while techinically that fix has been correct, all other similar variables are handled differently. Make it consistent, and let scripts/create_config expand and capitalize the variable properly like for all other qemu_*dir variables. Signed-off-by: Michael Tokarev (cherry picked from commit f354b1a1ee7a1c72d51b42808724a2b10eec315f) Conflicts: configure Signed-off-by: Michael Roth --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index f01eb27..199a89b 100755 --- a/configure +++ b/configure @@ -3191,7 +3191,7 @@ echo "sysconfdir=$sysconfdir" >> $config_host_mak echo "qemu_confdir=$qemu_confdir" >> $config_host_mak echo "qemu_datadir=$qemu_datadir" >> $config_host_mak echo "qemu_docdir=$qemu_docdir" >> $config_host_mak -echo "CONFIG_QEMU_HELPERDIR=\"`eval echo $libexecdir`\"" >> $config_host_mak +echo "qemu_helperdir=$libexecdir" >> $config_host_mak echo "ARCH=$ARCH" >> $config_host_mak if test "$debug_tcg" = "yes" ; then