From patchwork Wed Apr 4 18:32:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 150787 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 0D286B7016 for ; Thu, 5 Apr 2012 05:16:07 +1000 (EST) Received: from localhost ([::1]:49369 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFV0i-0000Fi-DQ for incoming@patchwork.ozlabs.org; Wed, 04 Apr 2012 14:32:48 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59432) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFV0K-0008S8-Aw for qemu-devel@nongnu.org; Wed, 04 Apr 2012 14:32:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SFV0B-0001k0-S6 for qemu-devel@nongnu.org; Wed, 04 Apr 2012 14:32:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53891) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFV0B-0001gJ-Ji for qemu-devel@nongnu.org; Wed, 04 Apr 2012 14:32:15 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q34IWCr7003047 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 4 Apr 2012 14:32:12 -0400 Received: from blackpad.lan.raisama.net (ovpn-116-80.ams2.redhat.com [10.36.116.80]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q34IWAAU026775; Wed, 4 Apr 2012 14:32:11 -0400 Received: by blackpad.lan.raisama.net (Postfix, from userid 500) id 3C99A201173; Wed, 4 Apr 2012 15:32:26 -0300 (BRT) From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Wed, 4 Apr 2012 15:32:17 -0300 Message-Id: <1333564345-13011-7-git-send-email-ehabkost@redhat.com> In-Reply-To: <1333564345-13011-1-git-send-email-ehabkost@redhat.com> References: <1333564345-13011-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Paolo Bonzini Subject: [Qemu-devel] [PATCH 06/14] config-host.mak: rename confdir to qemu_confdir 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 $confdir is a confusing name, as it's not clear if it's "the system config dir" or "the Qemus-specific directory inside the config dir". $qemu_confdir makes it more clear. The current C code that uses CONFIG_QEMU_CONFDIR should be safe, as now create_config generates the same #define name (CONFIG_QEMU_CONFDIR) for both "confdir" and "qemu_confdir" variables. Signed-off-by: Eduardo Habkost --- configure | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 76144aa..7009030 100755 --- a/configure +++ b/configure @@ -2983,7 +2983,7 @@ echo "mandir=$mandir" >> $config_host_mak echo "qemu_datadir=$qemu_datadir" >> $config_host_mak echo "sysconfdir=$sysconfdir" >> $config_host_mak echo "docdir=$qemu_docdir" >> $config_host_mak -echo "confdir=$qemu_confdir" >> $config_host_mak +echo "qemu_confdir=$qemu_confdir" >> $config_host_mak echo "libexecdir=\${prefix}/libexec" >> $config_host_mak echo "CONFIG_QEMU_SHAREDIR=\"$prefix$datasuffix\"" >> $config_host_mak echo "CONFIG_QEMU_HELPERDIR=\"$prefix/libexec\"" >> $config_host_mak