From nobody Mon Feb 9 17:37:08 2026 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576155465; cv=none; d=zohomail.com; s=zohoarc; b=M13JBlS6IetpuDZPvmQWGPzdOwbKZKEHyjoXRltzrcZ8oaBXqmCEjn+YeMn6Pm8XM7rgOvxAZmS4ZQj/aGH3YhIyPhRzH30AjWq68TtD8dNM2DLfl2RgbAHnUwgAEle8RulK4ZifhT9d4iWquNIFSTUfTzEccS6eEnvsToPhGK4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576155465; h=Content-Type:Content-Transfer-Encoding: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=lAA1rauPYw3IdpUqrU8014lOsyjgeqIfQTPWD16bhyU=; b=Sp65Dq2AwqvmiUDDYqcUrpVoLnigmZxWXPHOEAJ/wiJ/mSBJTIHhKzhCeNXtrLSOcB6fzybbIjUCG6RMezwdUk/qefGq/ufy8ZePQGVEawjSeohCA2ibh7R5GioEae34jqcvB4qOcgBdpxOfMsMlI50jgmtV8EiY07Y9Xbe+KTk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1576155465993286.001419884307; Thu, 12 Dec 2019 04:57:45 -0800 (PST) Received: from localhost ([::1]:58902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifO2K-0008HY-CU for importer@patchew.org; Thu, 12 Dec 2019 07:57:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55524) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNxn-0002bK-T6 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNxm-0005bh-QC for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:03 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:38625) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNxm-0005Zo-Ij for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:02 -0500 Received: by mail-wm1-x335.google.com with SMTP id p17so2374008wmi.3 for ; Thu, 12 Dec 2019 04:53:02 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lAA1rauPYw3IdpUqrU8014lOsyjgeqIfQTPWD16bhyU=; b=AEUUq2eQC1y04DVlwqhtHbH5q85fKMba2+z67LVO//TenswBIQehzV4XVBgS9ih+Ee xYfHjIpojqS0qt9TGiYT+FJE5ZN5HwRyS85mPFxVjQ7u0f30Ejuf1u+LaYqf3388h5aa XTnLkh7dcvsScL6ogtIK8LHOWuFGZNOh/p/NnYf6BbrqX1KHDKww1YzAtszbyEmaD33H iKMBAr52EDuWhf0wycCmOWGbz5n9gZy6bHHnscIgxQCBxaXlyyoGuz0LoirYqF+jwJGB aYLRg6ailW/htf4KIpxJoH0C67iq8sM8X4nFbaWwqHfiCe9QnnlmfQHo5pBfvzdO5Wl/ rKTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=lAA1rauPYw3IdpUqrU8014lOsyjgeqIfQTPWD16bhyU=; b=npmMyHGRilSYOSHnVzotNvH0UY3bcTExZSHj+NlaxS4xlRB9BxoESub9UDp3p5T0Ay q2Yy1c/CbOenwFQFY66Z813xhO2sv1FAVBnolhnN2K6Q2ZlzArKsA35wi78pazWPZDhX f5OD/7/RVvxhrrST+F6KSy+UFQe262a4LZDZgO5UEVUIlKJDg8j3EVejKgtpkSDQAavB aWp6ZN55QbYa5Bwz79Poc2oxiu9aqVjPSDJ6zysoz/ZHufEed0l0p+X42Hu4xDIiMgwk v5wUAEI1E96c9g0ZKlS5l/91Gv008LmfV/6/lMTQGFHaWswgO85mvU0/do3SLMiaDlh6 GHlQ== X-Gm-Message-State: APjAAAUBhD2Xzww/HXeHfrIBZP/6VjICQZYqEa3Gr3XZ8s/v1s9gLHcr LPTlGd/7Im5LLyjF+MwT+dV8UBl5 X-Google-Smtp-Source: APXvYqzVi6EPtHjIiN2lriJmXybAtb1AQ180AnLTEHmQRDtlZ/ywPdVo1iHIWUDhnSvo8SkAfzGewA== X-Received: by 2002:a7b:cbcd:: with SMTP id n13mr6455917wmi.104.1576155181268; Thu, 12 Dec 2019 04:53:01 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 003/132] configure: expand path variables for meson configure Date: Thu, 12 Dec 2019 13:50:47 +0100 Message-Id: <1576155176-2464-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::335 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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 9745b87..a444bc3 100755 --- a/configure +++ b/configure @@ -404,16 +404,7 @@ DSOSUF=3D".so" LDFLAGS_SHARED=3D"-shared" modules=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"" @@ -926,12 +917,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 @@ -1529,6 +1514,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 1.8.3.1