From: Sam James <sam@gentoo.org>
Date: Wed, 20 Sep 2023 13:34:17 +0000 (+0100)
Subject: build: Fix the double-prefix in pkgconfig
X-Git-Tag: v7.19~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=75cd25a0e14088c6d77ac3296bda74baae2b13c3;p=thirdparty%2Fipset.git

build: Fix the double-prefix in pkgconfig

Remove the extraneous pkgconfigdir definition and use the proper
one from pkg.m4 via PKG_INSTALLDIR.

Fixes: 326932be0c4f47756f9809cad5a103ac310f700d
Signed-off-by: Sam James <sam@gentoo.org>
Signed-off-by: Jozsef Kadlecsik <kadlec@netfilter.org>
---

diff --git a/configure.ac b/configure.ac
index cad93af9..6c26645c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,6 +14,7 @@ LT_CONFIG_LTDL_DIR([libltdl])
 LTDL_INIT([nonrecursive])
 
 PKG_PROG_PKG_CONFIG
+PKG_INSTALLDIR
 
 dnl Shortcut: Linux supported alone
 case "$host" in
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 50d937db..a9edf955 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -46,7 +46,6 @@ EXTRA_libipset_la_SOURCES = \
 
 EXTRA_DIST = $(IPSET_SETTYPE_LIST) libipset.map
 
-pkgconfigdir = $(prefix)/$(libdir)/pkgconfig
 pkgconfig_DATA = libipset.pc
 
 dist_man_MANS = libipset.3