From 6090483143d53a136e46186887edb3961b825682 Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@pobox.com>
Date: Tue, 8 Feb 2011 23:44:27 +0100
Subject: [PATCH] uninstalled-env ordering tweaks to fix readline's file name

* 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.
---
 meta/uninstalled-env.in | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/meta/uninstalled-env.in b/meta/uninstalled-env.in
index 918b94da7..b3deed5ab 100644
--- a/meta/uninstalled-env.in
+++ b/meta/uninstalled-env.in
@@ -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.