summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2011-07-23 22:23:59 +0200
committerLudovic Courtès <ludo@gnu.org>2011-07-23 22:43:38 +0200
commitf4b7d918eff9770f09893b023fd834f5c0bc33d1 (patch)
tree04ce205d3c1f5c13137fda9baedd68898b654216
parent0d2e3fc1e7095c7b64845b29ff01e2077329f127 (diff)
downloadguile-f4b7d918eff9770f09893b023fd834f5c0bc33d1.tar.gz
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.
-rw-r--r--configure.ac4
-rwxr-xr-xmeta/guild.in4
-rw-r--r--meta/uninstalled-env.in4
3 files changed, 11 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index b629f5c3d..dc4ef5681 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1636,6 +1636,10 @@ pkgdatadir="$datadir/$PACKAGE_TARNAME"
sitedir="$pkgdatadir/site/$GUILE_EFFECTIVE_VERSION"
AC_SUBST([sitedir])
+dnl Name of the `guile' program.
+guile_program_name="`echo guile | "$SED" "$program_transform_name"`"
+AC_SUBST([guile_program_name])
+
# Additional SCM_I_GSC definitions are above.
AC_SUBST([SCM_I_GSC_GUILE_DEBUG])
AC_SUBST([SCM_I_GSC_ENABLE_DEPRECATED])
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 "$@"