diff options
| author | Sergey Trofimov <sarg@sarg.org.ru> | 2023-11-05 19:31:03 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2025-06-02 11:20:22 +0200 |
| commit | 7fef609df1a61898764623f5cd4d4a930e5f19ea (patch) | |
| tree | 4f035b809fca293d93f3910e65c04ae576a023b1 | |
| parent | 70a14b27b5f0094400e696ef974a02912a5666b6 (diff) | |
build: Require scripts/guix in pre-inst-env.
* Makefile.am: Make scripts/guix depend on local guile.
* build-aux/pre-inst-env.in: Require scripts/guix.
Change-Id: Ib248da80a1e8215c4c5e6c485ade41a893ac0fd5
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | build-aux/pre-inst-env.in | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index f4155f01b6..595a7c02e9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -48,7 +48,7 @@ do_subst = $(SED) \ -e 's,[@]abs_top_builddir[@],$(abs_top_builddir),g' \ -e 's,[@]localedir[@],$(localedir),g' -scripts/guix: scripts/guix.in Makefile +scripts/guix: scripts/guix.in Makefile guile$(EXEEXT) $(AM_V_at)rm -f $@ $@-t $(AM_V_at)$(MKDIR_P) "$(@D)" $(AM_V_GEN)$(do_subst) < "$(srcdir)/$@.in" > "$@-t" diff --git a/build-aux/pre-inst-env.in b/build-aux/pre-inst-env.in index cd90a06cbc..c18d372335 100644 --- a/build-aux/pre-inst-env.in +++ b/build-aux/pre-inst-env.in @@ -46,6 +46,12 @@ export PATH GUIX="$abs_top_builddir/scripts/guix" export GUIX +# Sanity check. +if [ "$1" = "guix" ] && [ ! -f "$GUIX" ]; then + echo "$GUIX is not built. Please run 'make scripts/guix'." + exit 1 +fi + # Define $GUIX_UNINSTALLED to prevent `guix' from # prepending @guilemoduledir@ to the Guile load paths. |