From 1c8a6308c0050189a777d9384f270aea3206c2e0 Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@pobox.com>
Date: Thu, 31 Mar 2011 23:33:00 +0200
Subject: [PATCH] fix duplicate path in uninstalled-env

* meta/uninstalled-env.in: Our code that checked for paths already being
  in the load path was not working for the last entry in the load path.
  This caused the last entry to be re-added to the beginning, which also
  caused relative filename canonicalization to prepend "module/" to
  everything.

  Terrible.
---
 meta/uninstalled-env.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/uninstalled-env.in b/meta/uninstalled-env.in
index b3deed5ab..4faad641b 100644
--- a/meta/uninstalled-env.in
+++ b/meta/uninstalled-env.in
@@ -59,10 +59,12 @@ else
     # The ":" prevents prefix aliasing.
     case x"$GUILE_LOAD_PATH" in
       x*${top_srcdir}${d}:*) ;;
+      x*${top_srcdir}${d}) ;;
       *) GUILE_LOAD_PATH="${top_srcdir}${d}:$GUILE_LOAD_PATH" ;;
     esac
     case x"$GUILE_LOAD_PATH" in
       x*${top_builddir}${d}:*) ;;
+      x*${top_builddir}${d}) ;;
       *) GUILE_LOAD_PATH="${top_builddir}${d}:$GUILE_LOAD_PATH" ;;
     esac
   done
@@ -79,6 +81,7 @@ else
     # The ":" prevents prefix aliasing.
     case x"$GUILE_LOAD_COMPILED_PATH" in
       x*${top_builddir}${d}:*) ;;
+      x*${top_builddir}${d}) ;;
       *) GUILE_LOAD_COMPILED_PATH="${top_builddir}${d}:$GUILE_LOAD_COMPILED_PATH" ;;
     esac
   done