From 2d2ce04b9931927ffd045f9ebba3d39d4d31f7db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Neal=20Gompa=20=28=E3=83=8B=E3=83=BC=E3=83=AB=E3=83=BB?= =?UTF-8?q?=E3=82=B4=E3=83=B3=E3=83=91=29?= Date: Fri, 21 Aug 2020 13:43:32 -0400 Subject: [PATCH] lib/libzfs, rpm: Install pkgconfig files in the correct directory (#10628) libzfs is an architecture-specific library, thus its pkgconfig files should also be installed into the architecture-specific path for pkgconfig files so that systems that support multilib or multiarch installation will be able to work properly. Signed-off-by: Neal Gompa Reviewed-by: Tony Hutter Reviewed-by: Brian Behlendorf --- lib/libzfs/Makefile.am | 2 +- rpm/generic/zfs.spec.in | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libzfs/Makefile.am b/lib/libzfs/Makefile.am index 421970413d..c13184378d 100644 --- a/lib/libzfs/Makefile.am +++ b/lib/libzfs/Makefile.am @@ -8,7 +8,7 @@ VPATH = \ # Suppress unused but set variable warnings often due to ASSERTs AM_CFLAGS += $(NO_UNUSED_BUT_SET_VARIABLE) -libzfs_pcdir = $(datarootdir)/pkgconfig +libzfs_pcdir = $(libdir)/pkgconfig libzfs_pc_DATA = libzfs.pc libzfs_core.pc DEFAULT_INCLUDES += \ diff --git a/rpm/generic/zfs.spec.in b/rpm/generic/zfs.spec.in index 545627d4bf..5d2536420c 100644 --- a/rpm/generic/zfs.spec.in +++ b/rpm/generic/zfs.spec.in @@ -471,8 +471,8 @@ systemctl --system daemon-reload >/dev/null || true %{_libdir}/libzfs*.so.* %files -n libzfs2-devel -%{_datarootdir}/pkgconfig/libzfs.pc -%{_datarootdir}/pkgconfig/libzfs_core.pc +%{_libdir}/pkgconfig/libzfs.pc +%{_libdir}/pkgconfig/libzfs_core.pc %{_libdir}/*.so %{_includedir}/* %doc AUTHORS COPYRIGHT LICENSE NOTICE README.md