[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/09: build: 'script/guix' uses our own 'guile' executable.
From: |
guix-commits |
Subject: |
04/09: build: 'script/guix' uses our own 'guile' executable. |
Date: |
Fri, 11 Dec 2020 13:07:32 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit fd247542215fbd10f28980f3d5255014b150e95a
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon Dec 7 15:17:22 2020 +0100
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 1a3ca22..9803ba5 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 0a3ab1f..e0194d6 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
- branch master updated (edc2acb -> eee3af8), guix-commits, 2020/12/11
- 01/09: maint: Avoid macros obsolete in Autoconf 2.70., guix-commits, 2020/12/11
- 02/09: maint: Remove unused 'NIX_VERSION' macro., guix-commits, 2020/12/11
- 03/09: Revert "services: openssh: Warn about 'password-authentication?' default.", guix-commits, 2020/12/11
- 05/09: self: Move Guile early in the module search path., guix-commits, 2020/12/11
- 06/09: guix: 'guile' executable ignores GUILE_LOAD_PATH during startup., guix-commits, 2020/12/11
- 04/09: build: 'script/guix' uses our own 'guile' executable.,
guix-commits <=
- 07/09: self: Remove the empty string from '%load-extensions'., guix-commits, 2020/12/11
- 09/09: gnu: esbuild: Update to 0.8.21., guix-commits, 2020/12/11
- 08/09: gnu: Add hsetroot., guix-commits, 2020/12/11