[PATCH] build: Use PKG_INSTALL_DIR

[PATCH] build: Use PKG_INSTALL_DIR

[Arsen Arsenović]

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

Re: [PATCH] build: Use PKG_INSTALL_DIR

[Arsen Arsenović]

[-- Attachment #1.1: Type: text/plain, Size: 357 bytes --]


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:


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: build: Use PKG_INSTALL_DIR --]
[-- Type: text/x-patch, Size: 1352 bytes --]

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


[-- Attachment #1.3: Type: text/plain, Size: 1423 bytes --]


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ć

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 377 bytes --]

[PATCH] build: Use PKG_INSTALL_DIR

[Arsen Arsenović]

* configure.ac: Call PKG_INSTALL_DIR to set pkgconfigdir.
* Makefile.am (pkgconfigdir): Remove.  Will be set via AC_SUBST.
---
Hi there,

This patch is in a similar vein to my earlier patch to Guile itself
posted at
https://lists.gnu.org/archive/html/guile-devel/2023-03/msg00040.html

These came up while I was working on packaging Guile in Gentoo.

My current plan with this is to install the guile-lib pkg-config file
alongside its matching Guile versions, in order to support parallel
installation, seeing as otherwise two guile-lib builds against two
Guile versions collide in the pkg-config file they install.

Also, on a similar note, guile-lib installs to /usr/share/guile/site/
rather than /usr/share/guile/site/$EV (i.e. %global-site-dir instead of
%site-dir) like other packages do.  Why is that the case?  In this
instance, it's probably okay as guile-lib installs identical Scheme code
for different Guile effective versions, but I'm not sure that can be
said about the general case.

Should guile-lib use %site-dir?

Thanks in advance, have a lovely day.

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

diff --git a/Makefile.am b/Makefile.am
index 4f981d1..47805b3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,6 @@
 ####
 
 
-pkgconfigdir=$(libdir)/pkgconfig
 pkgconfig_DATA=meta/guile-lib-1.0.pc
 
 SUBDIRS = 		\
diff --git a/configure.ac b/configure.ac
index 7171296..3070aa4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,6 +66,7 @@ GUILE_SITE_DIR
 GUILE_GLOBAL_SITE_DIR
 GUILE_SITE_CCACHE_DIR
 GUILE_FLAGS
+PKG_INSTALLDIR
 
 dnl This argument is passed to guild; it ensures cross-compiling uses
 dnl the right target.
-- 
2.40.0

Re: [PATCH] build: Use PKG_INSTALL_DIR

[David Pirotte]

[-- Attachment #1: Type: text/plain, Size: 1156 bytes --]

Hello Arsen,

> ...
> This patch is in a similar vein to my earlier patch to Guile itself
> posted at
> https://lists.gnu.org/archive/html/guile-devel/2023-03/msg00040.html

> These came up while I was working on packaging Guile in Gentoo.
> ...

I pushed the proposed changes to the devel branch, will be part of the
next release, thanks.

> Also, on a similar note, guile-lib installs to /usr/share/guile/site/
> rather than /usr/share/guile/site/$EV (i.e. %global-site-dir instead
> of %site-dir) like other packages do.  Why is that the case?

Because, as you spotted yourself, guile-lib src modules are guile
version agnostic ... 

But i'll think about it, as it appears i am a bit lonely, to think one
shouldn't (ever) duplicate guile version agnostic code (on the same
machine), as doing so could lead to other (potentially serious)
problem(s) ...

Meanwhile, as all distro do, feel free to patch this downstream, to
install the scr modules in $prefix/share/guile/site/$EV - but the
ideal would be to have 'the machinery' to properly handle one version
of the (identical) src modules, multiple .go versions ...

David

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]