unofficial mirror of guile-devel@gnu.org 
 help / color / mirror / Atom feed
From: "Arsen Arsenović" <arsen@aarsen.me>
To: guile-devel@gnu.org
Cc: "Arsen Arsenović" <arsen@aarsen.me>
Subject: [PATCH] build: Use PKG_INSTALL_DIR
Date: Mon, 27 Mar 2023 00:39:24 +0200	[thread overview]
Message-ID: <20230326223923.3077447-1-arsen@aarsen.me> (raw)

This allows users to adjust their pkg-config install location.

* configure.ac: Call PKG_INSTALLDIR.
* meta/Makefile.am (pkgconfig_DATA): Remove.  It will be defined
automatically by the PKG_INSTALLDIR invocation.
---
Evening,

This patch adds an invocation of the PKG_INSTALLDIR macro from pkg.m4,
allowing users to override where they install pkg-config files in a
relatively standard manner.  The effect of a default installation should
remain the same.

Tested on x86_64-pc-linux-gnu.

Have a lovely evening.

 configure.ac     | 1 +
 meta/Makefile.am | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index d5ce1c4ac..5a615a8db 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
-- 
2.40.0




             reply	other threads:[~2023-03-26 22:39 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-26 22:39 Arsen Arsenović [this message]
2023-03-26 22:41 ` [PATCH] build: Use PKG_INSTALL_DIR Arsen Arsenović
  -- strict thread matches above, loose matches on Subject: below --
2023-04-18 10:56 Arsen Arsenović
2024-03-26  0:44 ` David Pirotte

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/guile/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230326223923.3077447-1-arsen@aarsen.me \
    --to=arsen@aarsen.me \
    --cc=guile-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).