[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] build: Use PKG_INSTALL_DIR
From: |
Arsen Arsenović |
Subject: |
Re: [PATCH] build: Use PKG_INSTALL_DIR |
Date: |
Mon, 27 Mar 2023 00:41:13 +0200 |
Arsen Arsenović <arsen@aarsen.me> writes:
> 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
Oh, shoo, I just noticed I made a typo here. This changelog entry
ought to refer to pkgconfigdir, of course. Updated patch:
From 54ecc95630c0473e1d28fe89bc7ffe18cce57da2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
Date: Mon, 27 Mar 2023 00:09:51 +0200
Subject: [PATCH] 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 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
Apologies for the inconvenience, have a lovely evening.
> 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
--
Arsen Arsenović
signature.asc
Description: PGP signature