File 0001-Revert-Install-kmod.pc-in-datadir-pkgconfi... of Package kmod

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Revert-Install-kmod.pc-in-datadir-pkgconfig.patch of Package kmod (Revision b01f2f9044bdcc8c429a9a392742aa72)

Currently displaying revision b01f2f9044bdcc8c429a9a392742aa72 , Show latest

From 1af09d6a92cd9e95942d8e969e9d84715f5903da Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.de>
Date: Wed, 28 Aug 2024 14:59:35 +0200
Subject: [PATCH 1/4] Revert "Install kmod.pc in ${datadir}/pkgconfig"

This reverts commit e4130a46dd315310eed37c6bb59ca047e849dd43.

kmod.pc does give the configuration of the library and tools, and is not
platform independent data. The library can be built with different
options depending on architecture, and one of the possible uses for
module directory is to install kernel modules in different
per-architecuture locations.

Signed-off-by: Michal Suchanek <msuchanek@suse.de>
---
 Makefile.am  | 4 ++--
 configure.ac | 3 ---
 meson.build  | 1 -
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 1a518585841e..d69d6b05ddd5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -118,8 +118,8 @@ libkmod_libkmod_internal_la_LDFLAGS = $(AM_LDFLAGS) \
 libkmod_libkmod_internal_la_DEPENDENCIES  = $(libkmod_libkmod_la_DEPENDENCIES)
 libkmod_libkmod_internal_la_LIBADD = $(libkmod_libkmod_la_LIBADD)
 
-pkgconfig_DATA = libkmod/libkmod.pc
-noarch_pkgconfig_DATA = tools/kmod.pc
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libkmod/libkmod.pc tools/kmod.pc
 
 bashcompletiondir=@bashcompletiondir@
 dist_bashcompletion_DATA = \
diff --git a/configure.ac b/configure.ac
index d179159a777b..1d4df325aad0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -222,9 +222,6 @@ GTK_DOC_CHECK([1.14],[--flavour no-tmpl-flat])
 ], [
 AM_CONDITIONAL([ENABLE_GTK_DOC], false)])
 
-PKG_INSTALLDIR
-PKG_NOARCH_INSTALLDIR
-
 #####################################################################
 # Default CFLAGS and LDFLAGS
 #####################################################################

Places

File 0001-Revert-Install-kmod.pc-in-datadir-pkgconfig.patch of Package kmod (Revision b01f2f9044bdcc8c429a9a392742aa72)

Places