From nobody Sun Feb 8 17:04:17 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594894333; cv=none; d=zohomail.com; s=zohoarc; b=fxuV0dzqAoL1APt/4t4++ggpjnpHYWDCJ8VCHnD4yTr/VNqUQ2MPl4slps5Orrs70Br9bLLOszJwFSIu17oNOEsyiZhWoZoefnM0Tm4ldqGHM+YmzbtrTWTCyTRqWCc1GmjTPkACTi9ex+2eUIR9kjoUdfx3QKsXQLqq492zB8A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894333; 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=QBobqzgtzhes8YT1er0RAL41p1uvaIBfNLzQwjug1DY=; b=MD0OIgZ8QFPOwuhiVBxSzVFomrAeaECiCxbSbOlVvTlczHxCi2o8wQWAm/ujbueuSKgSLgeMMhfFRSSwDqP7ECwuf7saOKuJOx2gXxER8b7k9EFZPObqTNY72Wq560/X/la5XWblJZo0baGptQXo82XTZ5ey7gREPfSHp8y0zkM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1594894333708195.1217033118046; Thu, 16 Jul 2020 03:12:13 -0700 (PDT) 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-139-KQ520SeFOGiHuYlAcQAXsw-1; Thu, 16 Jul 2020 06:09:58 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B586C802806; Thu, 16 Jul 2020 10:09:52 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9365C6FEFD; Thu, 16 Jul 2020 10:09:52 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 63415181AAC0; Thu, 16 Jul 2020 10:09:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06GA7gNu021169 for ; Thu, 16 Jul 2020 06:07:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id CCE7B2DE6B; Thu, 16 Jul 2020 10:07:42 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 46C3F2DE9D for ; Thu, 16 Jul 2020 10:07:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894332; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=QBobqzgtzhes8YT1er0RAL41p1uvaIBfNLzQwjug1DY=; b=D+O7HXTcgoGxp4OOYffskrMHC2GdOW44OgnsUw2MO6eZPR9X85jaH0WbZ3UbPCF2hJk7rB bWAlwClBzM0zpB7on0SbzuU+6PNDhA0OsZiPVm4ndQlBZ9cLsg1xk1qgQ0ztHL2HFEQgtd 3rgdJhRGkB9M5PcDF6aQRbjZ9kNJ+MY= X-MC-Unique: KQ520SeFOGiHuYlAcQAXsw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 338/351] meson: install pkgconfig files Date: Thu, 16 Jul 2020 11:59:34 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- Makefile.am | 3 --- configure.ac | 4 ---- meson.build | 29 +++++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index d538d037eb0..e6a37deb4a5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,9 +25,6 @@ SUBDIRS =3D . XZ_OPT ?=3D -v -T0 export XZ_OPT =20 -pkgconfigdir =3D $(libdir)/pkgconfig -pkgconfig_DATA =3D libvirt.pc libvirt-qemu.pc libvirt-lxc.pc libvirt-admin= .pc - rpm: clean @(unset CDPATH ; $(MAKE) dist && rpmbuild -ta $(distdir).tar.xz) =20 diff --git a/configure.ac b/configure.ac index 06e7f7491e4..b0a6cad178a 100644 --- a/configure.ac +++ b/configure.ac @@ -109,9 +109,5 @@ AC_CONFIG_FILES([\ Makefile \ .color_coded \ .ycm_extra_conf.py \ - libvirt.pc \ - libvirt-qemu.pc \ - libvirt-lxc.pc \ - libvirt-admin.pc \ libvirt.spec mingw-libvirt.spec]) AC_OUTPUT diff --git a/meson.build b/meson.build index 65843ed574d..7b858797388 100644 --- a/meson.build +++ b/meson.build @@ -2214,6 +2214,35 @@ subdir('po') subdir('docs') =20 =20 +# install pkgconfig files +pkgconfig_files =3D [ + 'libvirt.pc.in', + 'libvirt-qemu.pc.in', + 'libvirt-lxc.pc.in', + 'libvirt-admin.pc.in', +] + +pkgconfig_conf =3D configuration_data() +pkgconfig_conf.set('VERSION', meson.project_version()) +pkgconfig_conf.set('datadir', datadir) +pkgconfig_conf.set('datarootdir', datadir) +pkgconfig_conf.set('exec_prefix', prefix) +pkgconfig_conf.set('includedir', includedir) +pkgconfig_conf.set('libdir', libdir) +pkgconfig_conf.set('prefix', prefix) + +pkgconfig_dir =3D libdir / 'pkgconfig' + +foreach file : pkgconfig_files + configure_file( + input: file, + output: '@BASENAME@', + configuration: pkgconfig_conf, + install: true, + install_dir: pkgconfig_dir, + ) +endforeach + # generate meson-config.h file configure_file(output: 'meson-config.h', configuration: conf) =20 --=20 2.26.2