From fd247542215fbd10f28980f3d5255014b150e95a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 7 Dec 2020 15:17:22 +0100 Subject: [PATCH] build: 'script/guix' uses our own 'guile' executable. * 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