recompiling with compile environments, fluid languages, cleanups

[bpt/guile.git] / pre-inst-guile.in

diff --git a/pre-inst-guile.in b/pre-inst-guile.in
index 5c44a9d..5adbabe 100644 (file)
--- a/pre-inst-guile.in
+++ b/pre-inst-guile.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-#      Copyright (C) 2002 Free Software Foundation
+#      Copyright (C) 2002, 2006, 2008 Free Software Foundation
 #
 #   This file is part of GUILE.
 #
@@ -16,8 +16,8 @@
 #
 #   You should have received a copy of the GNU General Public
 #   License along with GUILE; see the file COPYING.  If not, write
-#   to the Free Software Foundation, Inc., 59 Temple Place, Suite
-#   330, Boston, MA 02111-1307 USA
+#   to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+#   Floor, Boston, MA 02110-1301 USA
 
 # Commentary:
 
@@ -35,47 +35,15 @@
 
 # Code:
 
-# config
-subdirs_with_ltlibs="srfi guile-readline"       # maintain me
-
 # env (set by configure)
-top_srcdir="@top_srcdir@"
 top_builddir="@top_builddir_absolute@"
 
-[ x"$top_srcdir"   = x -o ! -d "$top_srcdir" -o \
-  x"$top_builddir" = x -o ! -d "$top_builddir" ] && {
-    echo $0: bad environment
-    echo top_srcdir=$top_srcdir
-    echo top_builddir=$top_builddir
-    exit 1
-}
-
-# handle GUILE_LOAD_PATH (no clobber)
-if [ x"$GUILE_LOAD_PATH" = x ] ; then
-    GUILE_LOAD_PATH="${top_srcdir}"
-else
-    # This hair prevents double inclusion.
-    # The ":" prevents prefix aliasing.
-    case x"$GUILE_LOAD_PATH" in x*${top_srcdir}:*) ;;
-      *) GUILE_LOAD_PATH="${top_srcdir}:$GUILE_LOAD_PATH" ;;
-    esac
-fi
-export GUILE_LOAD_PATH
-
-# handle LTDL_LIBRARY_PATH (no clobber)
-ltdl_prefix=""
-for dir in $subdirs_with_ltlibs ; do
-    ltdl_prefix="${top_builddir}/${dir}:${ltdl_prefix}"
-done
-LTDL_LIBRARY_PATH="${ltdl_prefix}$LTDL_LIBRARY_PATH"
-export LTDL_LIBRARY_PATH
-
 # set GUILE (clobber)
 GUILE=${top_builddir}/libguile/guile
 export GUILE
 
 # do it
-exec $GUILE "$@"
+exec ${top_builddir}/pre-inst-guile-env $GUILE "$@"
 
 # never reached
 exit 1