From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= Newsgroups: gmane.lisp.guile.devel Subject: [PATCH] build: Use PKG_INSTALL_DIR Date: Mon, 27 Mar 2023 00:39:24 +0200 Message-ID: <20230326223923.3077447-1-arsen@aarsen.me> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="6882"; mail-complaints-to="usenet@ciao.gmane.io" Cc: =?UTF-8?q?Arsen=20Arsenovi=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:23 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 1pgbDi-0001TP-Tw for guile-devel@m.gmane-mx.org; Mon, 27 Mar 2023 03:00:22 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pgbCy-0007dD-40; 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 1pgZ1d-0005JQ-Qj for guile-devel@gnu.org; Sun, 26 Mar 2023 18:39:45 -0400 Original-Received: from mout-p-201.mailbox.org ([80.241.56.171]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1pgZ1b-0007Mi-Jg for guile-devel@gnu.org; Sun, 26 Mar 2023 18:39:44 -0400 Original-Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:b231:465::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-201.mailbox.org (Postfix) with ESMTPS id 4Pl9qY1h7Xz9sbm; Mon, 27 Mar 2023 00:39:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aarsen.me; s=MBO0001; t=1679870377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=JbXy1wkq1Inx75MGo1xEnOExtc9UaW8ZbZleV7v4/wA=; b=tKJdl7wzh8stF6PJhZJdMyPGF1dDmPl+vaaGPY7TPbYi19aFfUZd1whc4nOSEoUQp/LztZ si4gyxkyt+c4a91zJjjDj6OuQldmUMsRvzV1nOskNetD0Vk0u7fRIfeHVn2u9hm1vODuvp FJJa9WaJAv413YvFj9V1AL5f/qJXwb2zoJdrg26qrs4utEDlW/z3VUD1xTNyofiCGgYwIL a4E0i82O0dlyzFFS9qlgC43BdaMuS+3+2DKMBfta1kJ5Zautxb8UyblSY4PSF2NPm5O7G3 0TPzT+2+zS3+wIg36nW9xUveMrTeFMpQttfWpVKX5UEt06+8tWTkwuMnaA6YgA== X-Rspamd-Queue-Id: 4Pl9qY1h7Xz9sbm Received-SPF: pass client-ip=80.241.56.171; envelope-from=arsen@aarsen.me; helo=mout-p-201.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:21803 Archived-At: 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