aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-12-07 15:17:22 +0100
committerLudovic Courtès <ludo@gnu.org>2020-12-11 19:06:53 +0100
commitfd247542215fbd10f28980f3d5255014b150e95a (patch)
tree8bfc9d4c1c7c4fe69f7b1200d7552822619945c7
parentd8051557aee9fa252b015ff67cc15681e8540777 (diff)
downloadguix-fd247542215fbd10f28980f3d5255014b150e95a.tar.gz
guix-fd247542215fbd10f28980f3d5255014b150e95a.zip
build: 'script/guix' uses our own 'guile' executable.
* Makefile.am (do_subst): Substitute @abs_top_builddir@. * scripts/guix.in: Use it.
-rw-r--r--Makefile.am1
-rw-r--r--scripts/guix.in2
2 files changed, 2 insertions, 1 deletions
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