remove stale env script, clean up gdb-pre-inst-guile

* env: Removed (a vestige of the guile-vm merge).

* gdb-pre-inst-guile.in: Make a bit more robust (using libtool
  --mode=execute).

env

@@ -1,5 +0,0 @@
-#!/bin/bash
-thisdir=$(cd $(dirname $0) && pwd)
-export GUILE_LOAD_PATH=$thisdir/module${GUILE_LOAD_PATH:+:$GUILE_LOAD_PATH}
-export LD_LIBRARY_PATH=$thisdir/src${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
-exec "$@"

gdb-pre-inst-guile.in

@@ -21,31 +21,18 @@
 
 # Commentary:
 
-# Usage: pre-inst-guile [ARGS]
+# Usage: gdb-pre-inst-guile [ARGS]
 #
-# This script arranges for the environment to support, and eventaully execs,
+# This script runs Guile from the build tree under GDB. See
-# the uninstalled binary guile executable located somewhere under libguile/,
+# ./pre-inst-guile for more information.
-# passing ARGS to it.  In the process, env var GUILE is clobbered, and the
-# following env vars are modified (but not clobbered):
-#   GUILE_LOAD_PATH
-#   LTDL_LIBRARY_PATH
 #
-# This script can be used as a drop-in replacement for $bindir/guile;
+# In addition to running ./gdb-pre-inst-guile, sometimes it's useful to
-# if there is a discrepency in behavior, that's a bug.
+# run e.g. ./check-guile -i ./gdb-pre-inst-guile foo.test.
 
 # Code:
 
+set -e
 # env (set by configure)
 top_builddir="@top_builddir_absolute@"
-
+exec ${top_builddir}/pre-inst-guile-env libtool --mode=execute \
-# set GUILE (clobber)
+    gdb --args ${top_builddir}/libguile/guile "$@"
-GUILE=${top_builddir}/libguile/.libs/lt-guile
-export GUILE
-
-# do it
-exec ${top_builddir}/pre-inst-guile-env gdb --args $GUILE "$@"
-
-# never reached
-exit 1
-
-# pre-inst-guile ends here