Blob Blame History Raw
From 570a9a048bb0e3a5c221ca87be9408ae35f711e2 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 8 Jan 2024 19:13:39 +0100
Subject: [PATCH] fix PKG_CONFIG_LIBDIR (#7013)

---
 Magick++/bin/Magick++-config.in | 4 +++-
 MagickCore/MagickCore-config.in | 4 +++-
 MagickWand/MagickWand-config.in | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Magick++/bin/Magick++-config.in b/Magick++/bin/Magick++-config.in
index 877545c1a7..d55208a513 100755
--- a/Magick++/bin/Magick++-config.in
+++ b/Magick++/bin/Magick++-config.in
@@ -7,7 +7,9 @@
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-export PKG_CONFIG_LIBDIR="${exec_prefix}/lib/pkgconfig"
+libdir=@libdir@
+pkgconfigdir=@pkgconfigdir@
+export PKG_CONFIG_LIBDIR="${pkgconfigdir}"
 
 usage='Usage: Magick++-config [--cppflags] [--cxxflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]
 
diff --git a/MagickCore/MagickCore-config.in b/MagickCore/MagickCore-config.in
index ab790055d1..2263a1dd2d 100644
--- a/MagickCore/MagickCore-config.in
+++ b/MagickCore/MagickCore-config.in
@@ -6,7 +6,9 @@
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-export PKG_CONFIG_LIBDIR="${exec_prefix}/lib/pkgconfig"
+libdir=@libdir@
+pkgconfigdir=@pkgconfigdir@
+export PKG_CONFIG_LIBDIR="${pkgconfigdir}"
 
 usage="\
 Usage: MagickCore-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]"
diff --git a/MagickWand/MagickWand-config.in b/MagickWand/MagickWand-config.in
index 647b80c2e7..03680cfdc8 100644
--- a/MagickWand/MagickWand-config.in
+++ b/MagickWand/MagickWand-config.in
@@ -6,7 +6,9 @@
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-export PKG_CONFIG_LIBDIR="${exec_prefix}/lib/pkgconfig"
+libdir=@libdir@
+pkgconfigdir=@pkgconfigdir@
+export PKG_CONFIG_LIBDIR="${pkgconfigdir}"
 
 usage="\
 Usage: MagickWand-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]"