Define `$(pkgconfigdir)` using `PKG_INSTALLDIR` in configure.ac

* This allows overriding the default using `--with-pkgconfigdir`
  passed to the configure script. FreeBSD for instance doesn't use
  the standard `$libdir/pkgconfig` directory. This macro has been
  present in pkg.m4 for over 9 years:
  https://gitlab.freedesktop.org/pkg-config/pkg-config/-/commit/5fc77a96b7a1114e296f968037342f060d4bc34b

diff --git a/configure.ac b/configure.ac
index df4b32bb2391ea99e19248a30f4b2cf4234e2e55..92a10332103c3f14f7966b4cd55a25f055375b0a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -286,6 +286,7 @@ AC_ARG_ENABLE([man-pdfs],
   [enable_man_pdfs=$HAVE_PS2PDF])
 AM_CONDITIONAL(ENABLE_MAN_PDFS,[test "x$enable_man_pdfs" = "xyes"])
 
+PKG_INSTALLDIR
 PKG_PROG_PKG_CONFIG
 
 AC_ARG_WITH(tclsh,

diff --git a/lib/cdt/Makefile.am b/lib/cdt/Makefile.am
index 65626150381a53bf07bc13113e7950c3932a82c3..ffcf2e49754bb830487b968e4f9a73826c794e83 100644 (file)
--- a/lib/cdt/Makefile.am
+++ b/lib/cdt/Makefile.am
@@ -3,7 +3,6 @@
 CDT_VERSION = "5:0:0"
 
 pkgextraincludedir = $(pkgincludedir)
-pkgconfigdir = $(libdir)/pkgconfig
 
 AM_CPPFLAGS = -I$(top_srcdir)/lib
 

diff --git a/lib/cgraph/Makefile.am b/lib/cgraph/Makefile.am
index 2b65491b9fbf58bd4f5fb311c878f1d3a61d850d..e1e96e5717324d66383ba975c58139723ab3671a 100644 (file)
--- a/lib/cgraph/Makefile.am
+++ b/lib/cgraph/Makefile.am
@@ -2,8 +2,6 @@
 
 CGRAPH_VERSION = "6:0:0"
 
-pkgconfigdir = $(libdir)/pkgconfig
-
 AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)/lib/cdt
 
 if WITH_WIN32

diff --git a/lib/circogen/Makefile.am b/lib/circogen/Makefile.am
index ae9bea30ed3cf532944caaa0c4baf17aedb80ef1..ac90f8094ccd15704aae1b58daefe615037a61d3 100644 (file)
--- a/lib/circogen/Makefile.am
+++ b/lib/circogen/Makefile.am
@@ -1,7 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-pkgconfigdir = $(libdir)/pkgconfig
-
 AM_CPPFLAGS = \
        -I$(top_srcdir)/lib \
        -I$(top_srcdir)/lib/common \

diff --git a/lib/edgepaint/Makefile.am b/lib/edgepaint/Makefile.am
index e4caa910160f9c6a7b159f49caa38f820789e339..cb0d4029c17024c112172925139a34b8ff3c381c 100644 (file)
--- a/lib/edgepaint/Makefile.am
+++ b/lib/edgepaint/Makefile.am
@@ -2,8 +2,6 @@
 
 LAB_GAMUT_VERSION = "1:0:0"
 
-pkgconfigdir = $(libdir)/pkgconfig
-
 AM_CPPFLAGS = \
        -I$(top_srcdir)/lib \
        -I$(top_srcdir)/lib/common \

diff --git a/lib/expr/Makefile.am b/lib/expr/Makefile.am
index 4faa56e11682c37ab8e2a266c7d56d3b31e6b919..6f8abc6e17b2c220d5d72648bfbcf6111cc29c83 100644 (file)
--- a/lib/expr/Makefile.am
+++ b/lib/expr/Makefile.am
@@ -2,8 +2,6 @@
 
 EXPR_VERSION = "4:0:0"
 
-pkgconfigdir = $(libdir)/pkgconfig
-
 AM_CPPFLAGS = \
        -I$(top_srcdir)/lib \
        -I$(top_builddir)/lib \

diff --git a/lib/gvc/Makefile.am b/lib/gvc/Makefile.am
index db110e3d8c16215626624bf86d9dfa6054243d4c..23ccd49411f279f2add0177df25cafee3ca2c242 100644 (file)
--- a/lib/gvc/Makefile.am
+++ b/lib/gvc/Makefile.am
@@ -2,8 +2,6 @@
 
 GVC_VERSION = "6:0:0"
 
-pkgconfigdir = $(libdir)/pkgconfig
-
 AM_CPPFLAGS = \
        -I$(top_srcdir)/lib \
        -I$(top_srcdir)/lib/common \

diff --git a/lib/gvpr/Makefile.am b/lib/gvpr/Makefile.am
index 7e73a313614662da9910fa5b641ed32fbf3bd2ae..759bad509a01775397f743030eaa7fa6aa8287a7 100644 (file)
--- a/lib/gvpr/Makefile.am
+++ b/lib/gvpr/Makefile.am
@@ -1,6 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-pkgconfigdir = $(libdir)/pkgconfig
 HOSTCC ?= $(CC)
 GVPR_VERSION = "2:0:0"
 

diff --git a/lib/pack/Makefile.am b/lib/pack/Makefile.am
index 7082b68b83336ad37a82ef63ed92f332e050997c..013b26f71ee211ab47fc3175e3fe630fed390d2b 100644 (file)
--- a/lib/pack/Makefile.am
+++ b/lib/pack/Makefile.am
@@ -1,7 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-#pkgconfigdir = $(libdir)/pkgconfig
-
 AM_CPPFLAGS = \
        -I$(top_srcdir)/lib \
        -I$(top_srcdir)/lib/common \

diff --git a/lib/pathplan/Makefile.am b/lib/pathplan/Makefile.am
index feb33715a495f993362cc674ac28edc8bc197de5..5bf3cf28b93aa98eea75955c563ef279c53436ad 100644 (file)
--- a/lib/pathplan/Makefile.am
+++ b/lib/pathplan/Makefile.am
@@ -2,8 +2,6 @@
 
 PATHPLAN_VERSION = "4:0:0"
 
-pkgconfigdir = $(libdir)/pkgconfig
-
 AM_CPPFLAGS = -I$(top_srcdir)/lib
 
 if WITH_WIN32

diff --git a/lib/xdot/Makefile.am b/lib/xdot/Makefile.am
index fe993b6f81f89a9797e1665ecf1dace83412e4ca..df408bc1673c0ab73aa2f2c0cab436352643affe 100644 (file)
--- a/lib/xdot/Makefile.am
+++ b/lib/xdot/Makefile.am
@@ -1,7 +1,5 @@
 # ## Process this file with automake to produce Makefile.in
 
-pkgconfigdir = $(libdir)/pkgconfig
-
 XDOT_VERSION = "4:0:0"
 
 pkginclude_HEADERS = xdot.h

diff --git a/redhat/graphviz.spec.fedora.in b/redhat/graphviz.spec.fedora.in
index da36a1c1419c667b2c8bd53d25ae14038df538cb..9357fbeddeed04289382f767005ad73e205fe3c5 100644 (file)
--- a/redhat/graphviz.spec.fedora.in
+++ b/redhat/graphviz.spec.fedora.in
@@ -949,7 +949,6 @@ make %{?_smp_mflags}
 rm -rf %{buildroot} __doc
 make DESTDIR=%{buildroot} \
         docdir=%{buildroot}%{_docdir}/%{name} \
-        pkgconfigdir=%{_libdir}/pkgconfig \
         install
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 cp -a %{buildroot}%{_datadir}/%{name}/doc __doc