From patchwork Mon Dec 7 15:29:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 25638 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7CEB927BC01; Mon, 7 Dec 2020 15:36:00 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2287D27BC00 for ; Mon, 7 Dec 2020 15:36:00 +0000 (GMT) Received: from localhost ([::1]:57228 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kmIYR-0007Q3-AU for patchwork@mira.cbaines.net; Mon, 07 Dec 2020 10:35:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42196) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmITe-00040J-HI for guix-patches@gnu.org; Mon, 07 Dec 2020 10:31:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:43400) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kmITe-0006Kj-4d for guix-patches@gnu.org; Mon, 07 Dec 2020 10:31:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kmITe-0003yG-1d for guix-patches@gnu.org; Mon, 07 Dec 2020 10:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45102] [PATCH 1/4] build: 'script/guix' uses our own 'guile' executable. References: <20201207152159.28551-1-ludo@gnu.org> In-Reply-To: <20201207152159.28551-1-ludo@gnu.org> Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Dec 2020 15:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45102 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45102@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 45102-submit@debbugs.gnu.org id=B45102.160735501815173 (code B ref 45102); Mon, 07 Dec 2020 15:31:02 +0000 Received: (at 45102) by debbugs.gnu.org; 7 Dec 2020 15:30:18 +0000 Received: from localhost ([127.0.0.1]:54936 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kmISv-0003wa-Mt for submit@debbugs.gnu.org; Mon, 07 Dec 2020 10:30:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51990) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kmISs-0003w5-RP for 45102@debbugs.gnu.org; Mon, 07 Dec 2020 10:30:15 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:57163) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kmISn-0005vL-Km; Mon, 07 Dec 2020 10:30:09 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=48438 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kmISj-0000cR-HU; Mon, 07 Dec 2020 10:30:07 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Mon, 7 Dec 2020 16:29:56 +0100 Message-Id: <20201207152959.28864-1-ludo@gnu.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * Makefile.am (do_subst): Substitute @abs_top_builddir@. * scripts/guix.in: Use it. --- Makefile.am | 1 + scripts/guix.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 1a3ca227a4..9803ba5dc7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,6 +39,7 @@ do_subst = $(SED) \ -e 's,[@]GUILE[@],$(GUILE),g' \ -e 's,[@]guilemoduledir[@],$(guilemoduledir),g' \ -e 's,[@]guileobjectdir[@],$(guileobjectdir),g' \ + -e 's,[@]abs_top_builddir[@],$(abs_top_builddir),g' \ -e 's,[@]localedir[@],$(localedir),g' scripts/guix: scripts/guix.in Makefile diff --git a/scripts/guix.in b/scripts/guix.in index 0a3ab1f64d..e0194d6ea2 100644 --- a/scripts/guix.in +++ b/scripts/guix.in @@ -1,4 +1,4 @@ -#!@GUILE@ \ +#!@abs_top_builddir@/guile \ --no-auto-compile -e main -s !# ;;; GNU Guix --- Functional package management for GNU