From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Arsen =?utf-8?Q?Arsenovi=C4=87?= Newsgroups: gmane.lisp.guile.devel Subject: Re: [PATCH] build: Use PKG_INSTALL_DIR Date: Mon, 27 Mar 2023 00:41:13 +0200 Message-ID: <86o7of6snj.fsf@aarsen.me> References: <20230326223923.3077447-1-arsen@aarsen.me> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="5055"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Arsen =?utf-8?Q?Arsenovi=C4=87?= To: guile-devel@gnu.org Original-X-From: guile-devel-bounces+guile-devel=m.gmane-mx.org@gnu.org Mon Mar 27 03:00:07 2023 Return-path: Envelope-to: guile-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pgbDS-00011F-UF for guile-devel@m.gmane-mx.org; Mon, 27 Mar 2023 03:00:06 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pgbCy-0007dQ-8E; Sun, 26 Mar 2023 20:59:36 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pgZ4r-0005f1-25 for guile-devel@gnu.org; Sun, 26 Mar 2023 18:43:05 -0400 Original-Received: from mout-p-202.mailbox.org ([80.241.56.172]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1pgZ4o-0000xY-6N for guile-devel@gnu.org; Sun, 26 Mar 2023 18:43:04 -0400 Original-Received: from smtp102.mailbox.org (smtp102.mailbox.org [10.196.197.102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4Pl9vQ31bQz9sSw; Mon, 27 Mar 2023 00:42:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aarsen.me; s=MBO0001; t=1679870578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=tPC1OCBlbLmbhfRg7ClXkmdFtGobEk9cCI+1sejAs4s=; b=lWK8GFZma7yKLoFrEbf48WS7Lm9IBW2bIIhgjsGPw5DrYfgKQW5IUuQtM1F5v/hgGwdd6s TM/kafZJJRQDY2OhwnIDXFQR4eWNUXW63+EXAa0yqvvzAIeo864Ud2/3PLXL1aL4kJlvY3 X5ES/KtJey2gRICUzBf/JKYi4JH+dA9HBDdIRpY40B5+Q/XyXwUKz5yEokH/wHOYTdIKq6 /mIfctDEmAByf3Qb21sFbhbYbIKy2PQLViygpUlYRe6/2/qgvoM4+6FPQhoqqakrUm0msz a6pwVIl0SNoXeLnYK3b2F85qaPN/8QAtMypBZsh/zlbPh0VMWdBJCs0cbuPDhg== In-reply-to: <20230326223923.3077447-1-arsen@aarsen.me> Received-SPF: pass client-ip=80.241.56.172; envelope-from=arsen@aarsen.me; helo=mout-p-202.mailbox.org X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Sun, 26 Mar 2023 20:59:34 -0400 X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guile-devel-bounces+guile-devel=m.gmane-mx.org@gnu.org Original-Sender: guile-devel-bounces+guile-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.lisp.guile.devel:21802 Archived-At: --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Arsen Arsenovi=C4=87 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: --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-build-Use-PKG_INSTALL_DIR.patch Content-Transfer-Encoding: quoted-printable Content-Description: build: Use PKG_INSTALL_DIR From=2054ecc95630c0473e1d28fe89bc7ffe18cce57da2 Mon Sep 17 00:00:00 2001 From: =3D?UTF-8?q?Arsen=3D20Arsenovi=3DC4=3D87?=3D 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. =2D-- 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 =2D-- 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" =3D yes) =20 +PKG_INSTALLDIR AM_PATH_LISPDIR =20 AC_DEFINE_UNQUOTED([HOST_TYPE], ["$host"], diff --git a/meta/Makefile.am b/meta/Makefile.am index acbd8e71a..28cd3b0b3 100644 =2D-- 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" =20 =2Dpkgconfigdir =3D $(libdir)/pkgconfig pkgconfig_DATA =3D guile-$(GUILE_EFFECTIVE_VERSION).pc =20 ## FIXME: in the future there will be direct automake support for =2D-=20 2.40.0 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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" =3D yes) >=20=20 > +PKG_INSTALLDIR > AM_PATH_LISPDIR >=20=20 > 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" >=20=20 > -pkgconfigdir =3D $(libdir)/pkgconfig > pkgconfig_DATA =3D guile-$(GUILE_EFFECTIVE_VERSION).pc >=20=20 > ## FIXME: in the future there will be direct automake support for =2D-=20 Arsen Arsenovi=C4=87 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iOUEARYKAI4WIQT+4rPRE/wAoxYtYGFSwpQwHqLEkwUCZCDKcF8UgAAAAAAuAChp c3N1ZXItZnByQG5vdGF0aW9ucy5vcGVucGdwLmZpZnRoaG9yc2VtYW4ubmV0RkVF MkIzRDExM0ZDMDBBMzE2MkQ2MDYxNTJDMjk0MzAxRUEyQzQ5MxAcYXJzZW5AYWFy c2VuLm1lAAoJEFLClDAeosSTFlsA+JEkcUiq1N1f1GT9Zw6QB2Mjh25iG7yP+ojn GqaUsdgBAOYWT4u7RgYvcL21Tv4w00p8vQ8nQZZ0eBWI6InKn8YK =geJA -----END PGP SIGNATURE----- --==-=-=--