From nobody Tue Feb 10 03:39:00 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597396934; cv=none; d=zohomail.com; s=zohoarc; b=Yr/E/j+HS8Gvy8c3sIYBqfRo9Is2x4OFIEwhcjxXvP2lPNoYsMz+UTuSwRyrSsQGqwoE5OhaaeKcRdtj2F6Q3f4zUNnPqHLXGCGf7Sx22RVxupOzzLtnRMw+uJ6qt8D8ZpoCY6nHoaeiuiLAERNqPpl1fdu1MNPLG3a5136eIUE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597396934; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mQFyJVdpVjaE0U+2hL8BlOmtacuv/C9XnPeWiNd02zw=; b=CuWeEeDiRzj9yKZ46svyj2HPZVxZz/mssggWZThWXpLQlglbmy8U6nG3nnBq8WIHdnSaPVVvahnYuUi1ArCQAcavzzQdzEaJLhgzWPuE3uEbxoEiFkg4MLFge46HTkTDGNw+AcFaQ9XHxufTFGWQ2ZTjekD+ZdIDvfVkuN9ELU0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1597396934085309.39888050699767; Fri, 14 Aug 2020 02:22:14 -0700 (PDT) Received: from localhost ([::1]:34494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k6Vue-000290-7w for importer@patchew.org; Fri, 14 Aug 2020 05:22:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42644) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k6VmZ-00056g-B2 for qemu-devel@nongnu.org; Fri, 14 Aug 2020 05:13:51 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:45499 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k6VmR-0002px-1T for qemu-devel@nongnu.org; Fri, 14 Aug 2020 05:13:50 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-318-Fdmt4y--Oee07Kx9nT-d8Q-1; Fri, 14 Aug 2020 05:13:39 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F0849801AC3 for ; Fri, 14 Aug 2020 09:13:38 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 83BBA709D2; Fri, 14 Aug 2020 09:13:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597396421; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mQFyJVdpVjaE0U+2hL8BlOmtacuv/C9XnPeWiNd02zw=; b=VzfyNauc/cNqiL/DZRGUxz+esNk78zeTFjx+EK6nteKRTfifuFswcie0eIJvtEFBW9CYfu Bc+Vawse+hpVANzhgchgoNZ7Xd6wdc1Kpt7Q4BU6LL6+JRzoEIIlZICvxRz/gTlIIBw1Pl 5mDoaVOzz/xCTUvYKhuSczKlQAVAkHA= X-MC-Unique: Fdmt4y--Oee07Kx9nT-d8Q-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 013/150] configure: expand path variables for meson configure Date: Fri, 14 Aug 2020 05:11:09 -0400 Message-Id: <20200814091326.16173-14-pbonzini@redhat.com> In-Reply-To: <20200814091326.16173-1-pbonzini@redhat.com> References: <20200814091326.16173-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/14 03:37:30 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- configure | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/configure b/configure index 606c327cca..373bb22287 100755 --- a/configure +++ b/configure @@ -415,16 +415,7 @@ LDFLAGS_SHARED=3D"-shared" modules=3D"no" module_upgrades=3D"no" prefix=3D"/usr/local" -mandir=3D"\${prefix}/share/man" -datadir=3D"\${prefix}/share" firmwarepath=3D"\${prefix}/share/qemu-firmware" -qemu_docdir=3D"\${prefix}/share/doc/qemu" -bindir=3D"\${prefix}/bin" -libdir=3D"\${prefix}/lib" -libexecdir=3D"\${prefix}/libexec" -includedir=3D"\${prefix}/include" -sysconfdir=3D"\${prefix}/etc" -local_statedir=3D"\${prefix}/var" confsuffix=3D"/qemu" slirp=3D"" oss_lib=3D"" @@ -979,12 +970,6 @@ if test "$mingw32" =3D "yes" ; then LIBS=3D"-liberty $LIBS" fi prefix=3D"c:/Program Files/QEMU" - mandir=3D"\${prefix}" - datadir=3D"\${prefix}" - qemu_docdir=3D"\${prefix}" - bindir=3D"\${prefix}" - sysconfdir=3D"\${prefix}" - local_statedir=3D confsuffix=3D"" libs_qga=3D"-lws2_32 -lwinmm -lpowrprof -lwtsapi32 -lwininet -liphlpapi = -lnetapi32 $libs_qga" fi @@ -1638,6 +1623,26 @@ for opt do esac done =20 +libdir=3D"${libdir:-$prefix/lib}" +libexecdir=3D"${libexecdir:-$prefix/libexec}" +includedir=3D"${includedir:-$prefix/include}" + +if test "$mingw32" =3D "yes" ; then + mandir=3D"$prefix" + datadir=3D"$prefix" + qemu_docdir=3D"$prefix" + bindir=3D"$prefix" + sysconfdir=3D"$prefix" + local_statedir=3D +else + mandir=3D"${mandir:-$prefix/share/man}" + datadir=3D"${datadir:-$prefix/share}" + qemu_docdir=3D"${qemu_docdir:-$prefix/share/doc/qemu}" + bindir=3D"${bindir:-$prefix/bin}" + sysconfdir=3D"${sysconfdir:-$prefix/etc}" + local_statedir=3D"${local_statedir:-$prefix/var}" +fi + case "$cpu" in ppc) CPU_CFLAGS=3D"-m32" --=20 2.26.2