From nobody Tue Feb 10 02:43:22 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 158023460622074.96946465919802; Tue, 28 Jan 2020 10:03:26 -0800 (PST) Received: from localhost ([::1]:34844 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwVCu-0001al-W5 for importer@patchew.org; Tue, 28 Jan 2020 13:03:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57476) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwV3v-00060R-4V for qemu-devel@nongnu.org; Tue, 28 Jan 2020 12:54:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwV3u-0007dx-0j for qemu-devel@nongnu.org; Tue, 28 Jan 2020 12:54:07 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:37413) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iwV3t-0007aA-PN for qemu-devel@nongnu.org; Tue, 28 Jan 2020 12:54:05 -0500 Received: by mail-wr1-x430.google.com with SMTP id w15so17133180wru.4 for ; Tue, 28 Jan 2020 09:54:05 -0800 (PST) Received: from localhost.localdomain (93-36-56-206.ip58.fastwebnet.it. [93.36.56.206]) by smtp.gmail.com with ESMTPSA id o4sm27046968wrx.25.2020.01.28.09.54.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jan 2020 09:54:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vEcKGbffw+zE4Kg4OdL7gu3XD1/KfyZzBwjSGef9vFo=; b=gFiwLNxUbQtwii3YYDbZYXfolO42rfZ7BTquom3jfPXkAjXvwWuiSmeyjiHRIZ88UI unggrtDCYPGQcrXeI1/e3Xg6IhSG7EwNo4QhG0wOqgGHasFRyjkiBFu2VFC9Nb7hbIwZ qmN39pMQsRl8HxeRW1UVqmmLCjtrSJTsZ3yml/k4dXf4HVFWswoQdSmf3B5yzLO63B1/ w74Cvn/yUoUMA6t2vq9aPok2rE8j8nlF3MHNOmM07CQfv8Tntf8JdZ1bRnE/aScNr6Gx Fn3SVVbVdB9cf8h0pE6qv9FBeOwuSRYG8SzBgyWNuwqpQbCZV3Gtpj9G0kntBpj4obiZ DRFA== 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:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=vEcKGbffw+zE4Kg4OdL7gu3XD1/KfyZzBwjSGef9vFo=; b=ceKoTsnKVPbIkHRc1CcBp91p53i5FXOBXnj0c8HpPE/i+xGXr9H3pjcoQ2GmXJPSqz eBAdBZPQMCE69SCvbKCV0zrVtnAb6o1Fb8rNtsem1ZX85E4es1Bw50E3wxnYrTU+fQvt 6xuncXwuRYhpG56J8m0YUKxQz+6dpprVCV3nlwFnUl0vNrDLkugnj0e8EJoUzJa327i7 7VuTVpGUWdSNijYDjjnTq1ctuqmnyvoHJgGpwovg6i/pGhF64Dy4xxLFieO6/4E57TGM vQ2Vov5QgHnFOGuM5UnJhkfMUqj/fHQBUVnsF4TOzimrjEdf/KWVRFtMNqmzru58MH1K ZMmA== X-Gm-Message-State: APjAAAVHguUqTRJYG0hlfyu0BIWTKL8dE+EyM/y+QSQvtA5LojVVE3rR j+pygaiJMJIJOK1vyGzAUF5HGtl1 X-Google-Smtp-Source: APXvYqwD/T0o1Uralsbw9Ecld99e5r8JzPzqRbwrvsXkOF5kUv3rdajdurIRjNZHEPj8+vkTWo4EnA== X-Received: by 2002:adf:8297:: with SMTP id 23mr28689780wrc.379.1580234043561; Tue, 28 Jan 2020 09:54:03 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 006/142] configure: expand path variables for meson configure Date: Tue, 28 Jan 2020 18:51:26 +0100 Message-Id: <20200128175342.9066-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200128175342.9066-1-pbonzini@redhat.com> References: <20200128175342.9066-1-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::430 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: 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 e85c8bc515..a9d0b92a55 100755 --- a/configure +++ b/configure @@ -405,16 +405,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"" @@ -933,12 +924,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 @@ -1548,6 +1533,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.21.0