dmbcs/guile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

uninstalled-env ordering tweaks to fix readline's file name

Browse source 
* meta/uninstalled-env.in (subdirs_with_ltlibs): Remove "srfi".
  Reorder the load-path and load-compiled-path to put the root dir after
  guile-readline, so that relative canonicalization computes the correct
  path for ice-9/readline.scm.
This commit is contained in:
Andy Wingo 2011-02-08 23:44:27 +01:00
commit 6090483143
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
meta/uninstalled-env.in
View file

@ -1,6 +1,6 @@
#!/bin/sh
# Copyright (C) 2003, 2006, 2008, 2009, 2010 Free Software Foundation
# Copyright (C) 2003, 2006, 2008, 2009, 2010, 2011 Free Software Foundation
#
# This file is part of GUILE.
#
@ -32,7 +32,7 @@
# Example: ../../uninstalled-env ./guile-test-foo
# config
subdirs_with_ltlibs="srfi guile-readline libguile" # maintain me
subdirs_with_ltlibs="guile-readline libguile" # maintain me
# env (set by configure)
top_srcdir="@top_srcdir_absolute@"
@ -48,12 +48,12 @@ top_builddir="@top_builddir_absolute@"
if [ x"$GUILE_LOAD_PATH" = x ]
then
GUILE_LOAD_PATH="${top_srcdir}/module:${top_srcdir}:${top_srcdir}/guile-readline"
GUILE_LOAD_PATH="${top_srcdir}/module:${top_srcdir}/guile-readline:${top_srcdir}"
if test "${top_srcdir}" != "${top_builddir}"; then
GUILE_LOAD_PATH="$GUILE_LOAD_PATH:${top_builddir}/module:${top_builddir}:${top_builddir}/guile-readline"
GUILE_LOAD_PATH="$GUILE_LOAD_PATH:${top_builddir}/module:${top_builddir}/guile-readline:${top_builddir}"
fi
else
for d in "/module" "" "/guile-readline"
for d in "/module" "/guile-readline" ""
do
# This hair prevents double inclusion.
# The ":" prevents prefix aliasing.
@ -71,9 +71,9 @@ export GUILE_LOAD_PATH
if [ x"$GUILE_LOAD_COMPILED_PATH" = x ]
then
GUILE_LOAD_COMPILED_PATH="${top_builddir}/module:${top_builddir}:${top_builddir}/guile-readline"
GUILE_LOAD_COMPILED_PATH="${top_builddir}/module:${top_builddir}/guile-readline:${top_builddir}"
else
for d in "/module" "" "/guile-readline"
for d in "/module" "/guile-readline" ""
do
# This hair prevents double inclusion.
# The ":" prevents prefix aliasing.