From patchwork Wed May 26 14:08:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 53625 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2D928B7D12 for ; Thu, 27 May 2010 00:56:31 +1000 (EST) Received: from localhost ([127.0.0.1]:42265 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OHI20-0000Lv-7O for incoming@patchwork.ozlabs.org; Wed, 26 May 2010 10:56:28 -0400 Received: from [140.186.70.92] (port=45567 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OHHNH-0003NK-Aj for qemu-devel@nongnu.org; Wed, 26 May 2010 10:14:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OHHHu-0003u1-OQ for qemu-devel@nongnu.org; Wed, 26 May 2010 10:08:52 -0400 Received: from mail-ww0-f45.google.com ([74.125.82.45]:47342) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OHHHu-0003s2-JI for qemu-devel@nongnu.org; Wed, 26 May 2010 10:08:50 -0400 Received: by mail-ww0-f45.google.com with SMTP id 39so859075wwb.4 for ; Wed, 26 May 2010 07:08:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:to:subject:date :message-id:x-mailer:in-reply-to:references; bh=G0eDNPSvEzRhJPxuoX1Jgs70/7pMWpTZT1TlYOMDi/Q=; b=qZKN3YqK6qNMqZ1FfRdAVLWGNVPT1OvQB3aqzUTxPUoMUpTfOxnxJPYENcJUhrpA3K dCWDTbobDai2zzgE48mEOlYiHbRzHcKD1W6uVvUq3oPwoe1hn6Tddc3VNT2JCvslnuFq Sqn6Q35LeNT2wQfa+Y9+rZz7YEwInpNNLsYBo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; b=N7w3ZiQK3hpZotABiTS8YsuKOSTQz/Vf0K/YE/RO9EJ9WRcdI2S7OcC3b81YyOGEUE /lNpRXC48ug6q1iK7dShF+7b+vMozF7gzkns4svQ9LTQofS4JB8t0l1sVzt7ZgxBXsBy SS4ytXwa+PuQxDfh7zc9ewl2aa1qjWpdTIKDk= Received: by 10.227.136.73 with SMTP id q9mr8455812wbt.213.1274882929397; Wed, 26 May 2010 07:08:49 -0700 (PDT) Received: from localhost.localdomain (nat-pool-brq-t.redhat.com [209.132.186.34]) by mx.google.com with ESMTPS id z33sm890140wbd.1.2010.05.26.07.08.47 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 26 May 2010 07:08:48 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 26 May 2010 16:08:21 +0200 Message-Id: <1274882909-9800-7-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1274882909-9800-1-git-send-email-pbonzini@redhat.com> References: <1274882909-9800-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH 06/14] introduce confdir and confsuffix X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org confsuffix was write-only, flesh it out. Signed-off-by: Paolo Bonzini --- configure | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/configure b/configure index cf19ebf..435e765 100755 --- a/configure +++ b/configure @@ -1969,10 +1969,10 @@ if test "$mingw32" = "yes" ; then fi mansuffix="" datasuffix="" - confsuffix="" docsuffix="" binsuffix="" sysconfsuffix="" + confsuffix="" else if test -z "$prefix" ; then prefix="/usr/local" @@ -1982,9 +1982,11 @@ else docsuffix="/share/doc/qemu" binsuffix="/bin" sysconfsuffix="/etc" + confsuffix="/qemu" fi : ${sysconfdir:="${prefix}$sysconfsuffix"} +confdir=$sysconfdir$confsuffix echo "Install prefix $prefix" echo "BIOS directory $prefix$datasuffix" @@ -2062,11 +2064,7 @@ printf " '%s'" "$0" "$@" >> $config_host_mak echo >> $config_host_mak echo "CONFIG_QEMU_SHAREDIR=\"$prefix$datasuffix\"" >> $config_host_mak -if test "$mingw32" = "yes" ; then - echo "CONFIG_QEMU_CONFDIR=\"$sysconfdir\"" >> $config_host_mak -else - echo "CONFIG_QEMU_CONFDIR=\"${sysconfdir}/qemu\"" >> $config_host_mak -fi +echo "CONFIG_QEMU_CONFDIR=\"$confdir\"" >> $config_host_mak case "$cpu" in i386|x86_64|alpha|cris|hppa|ia64|m68k|microblaze|mips|mips64|ppc|ppc64|s390|s390x|sparc|sparc64)