diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2011-07-23 22:23:59 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2011-07-23 22:43:38 +0200 |
| commit | f4b7d918eff9770f09893b023fd834f5c0bc33d1 (patch) | |
| tree | 04ce205d3c1f5c13137fda9baedd68898b654216 /meta | |
| parent | 0d2e3fc1e7095c7b64845b29ff01e2077329f127 (diff) | |
guild: Close over `$bindir/guile'.
* configure.ac: Substitute `guile_program_name'.
* meta/guild.in: Use `@bindir@/@guile_program_name@' by default.
* meta/uninstalled-env.in: Define $GUILE.
Diffstat (limited to 'meta')
| -rwxr-xr-x | meta/guild.in | 4 | ||||
| -rw-r--r-- | meta/uninstalled-env.in | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/meta/guild.in b/meta/guild.in index 17edf6019..183323f75 100755 --- a/meta/guild.in +++ b/meta/guild.in @@ -1,6 +1,8 @@ #!/bin/sh # -*- scheme -*- -exec guile $GUILE_FLAGS -e '(@@ (guild) main)' -s "$0" "$@" +prefix="@prefix@" +exec_prefix="@exec_prefix@" +exec ${GUILE:-@bindir@/@guile_program_name@} $GUILE_FLAGS -e '(@@ (guild) main)' -s "$0" "$@" !# ;;;; guild --- running scripts bundled with Guile diff --git a/meta/uninstalled-env.in b/meta/uninstalled-env.in index 4faad641b..2276b4aed 100644 --- a/meta/uninstalled-env.in +++ b/meta/uninstalled-env.in @@ -136,4 +136,8 @@ if test "x${top_srcdir}" != "x${top_builddir}"; then fi export PATH +# Define $GUILE, used by `guild'. +GUILE="${top_builddir}/meta/guile" +export GUILE + exec "$@" |