diff options
| author | Andy Wingo <wingo@pobox.com> | 2012-04-26 22:17:47 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2012-04-26 22:17:47 +0200 |
| commit | e7501d4a682cc2b430514280834dfc68b97f2be2 (patch) | |
| tree | ff1ba27f86e7c1e896657acc633aa5cf59ddfd63 /meta | |
| parent | 649d3ea76639424fa5445a6f44896de1fdf1e309 (diff) | |
| parent | d10f7b572c0ca1ccef87f9c46069daa30946e0cf (diff) | |
Merge commit 'd10f7b572c0ca1ccef87f9c46069daa30946e0cf'
Conflicts:
libguile/smob.c
libguile/smob.h
test-suite/tests/tree-il.test
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/uninstalled-env.in | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/uninstalled-env.in b/meta/uninstalled-env.in index 5fa0db0cf..567c6e243 100644 --- a/meta/uninstalled-env.in +++ b/meta/uninstalled-env.in @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2003, 2006, 2008, 2009, 2010, 2011 Free Software Foundation +# Copyright (C) 2003, 2006, 2008, 2009, 2010, 2011, 2012 Free Software Foundation # # This file is part of GUILE. # @@ -57,12 +57,12 @@ if test "@cross_compiling@" = "no" then if [ x"$GUILE_LOAD_PATH" = x ] then - GUILE_LOAD_PATH="${top_srcdir}/module:${top_srcdir}/guile-readline:${top_srcdir}" + GUILE_LOAD_PATH="${top_srcdir}/module:${top_srcdir}/guile-readline" if test "${top_srcdir}" != "${top_builddir}"; then - GUILE_LOAD_PATH="$GUILE_LOAD_PATH:${top_builddir}/module:${top_builddir}/guile-readline:${top_builddir}" + GUILE_LOAD_PATH="$GUILE_LOAD_PATH:${top_builddir}/module:${top_builddir}/guile-readline" fi else - for d in "/module" "/guile-readline" "" + for d in "/module" "/guile-readline" do # This hair prevents double inclusion. # The ":" prevents prefix aliasing. @@ -82,9 +82,9 @@ then if test "x$GUILE_LOAD_COMPILED_PATH" = "x" then - GUILE_LOAD_COMPILED_PATH="${top_builddir}/module:${top_builddir}/guile-readline:${top_builddir}" + GUILE_LOAD_COMPILED_PATH="${top_builddir}/module:${top_builddir}/guile-readline" else - for d in "/module" "/guile-readline" "" + for d in "/module" "/guile-readline" do # This hair prevents double inclusion. # The ":" prevents prefix aliasing. |