[Guile-commits] 01/06: build: Use PKG_INSTALL_DIR

[Andy Wingo]

wingo pushed a commit to branch main
in repository guile.

commit ddc5e63b00f3a6bc7f8b64d0bc571c725848b31f
Author: Arsen Arsenović <arsen@aarsen.me>
AuthorDate: Mon Mar 27 00:09:51 2023 +0200

    build: Use PKG_INSTALL_DIR
    
    This allows users to adjust their pkg-config install location.
    
    * configure.ac: Call PKG_INSTALLDIR.
    * meta/Makefile.am (pkgconfigdir): Remove.  It will be defined
    automatically by the PKG_INSTALLDIR invocation.
---
 configure.ac     | 1 +
 meta/Makefile.am | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index c46586e9b..7dad1af7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,6 +148,7 @@ AC_SEARCH_LIBS([dlopen], [dl])
 AC_CHECK_PROG(have_makeinfo, makeinfo, yes, no)
 AM_CONDITIONAL(HAVE_MAKEINFO, test "$have_makeinfo" = yes)
 
+PKG_INSTALLDIR
 AM_PATH_LISPDIR
 
 AC_DEFINE_UNQUOTED([HOST_TYPE], ["$host"],
diff --git a/meta/Makefile.am b/meta/Makefile.am
index acbd8e71a..28cd3b0b3 100644
--- a/meta/Makefile.am
+++ b/meta/Makefile.am
@@ -37,7 +37,6 @@ install-exec-hook:
        cd $(DESTDIR)$(bindir) && rm -f "$$guile_tools" &&      \
        $(LN_S) "$$guild" "$$guile_tools"
 
-pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = guile-$(GUILE_EFFECTIVE_VERSION).pc
 
 ## FIXME: in the future there will be direct automake support for