[Guile-commits] GNU Guile branch, master, updated. release_1-9-11-38-g070d8db

[Andy Wingo]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=070d8db023c663ce14f25cb601d46b300ad82da4

The branch, master has been updated
       via  070d8db023c663ce14f25cb601d46b300ad82da4 (commit)
       via  8c4e90fa899c97c235c9af908eeca49e6fd4a151 (commit)
       via  875b58d240bc01eecb8c95581af2d8c94ecf19aa (commit)
      from  4ae3d5aae8cd0b012483072abb29acf4aeb3dbe8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 070d8db023c663ce14f25cb601d46b300ad82da4
Author: Andy Wingo <address@hidden>
Date:   Thu Jun 10 17:23:51 2010 +0200

    more uninstalled-env fixen
    
    * meta/uninstalled-env.in: Don't implicitly add . to LTDL
      search paths if no LTDL_LIBRARY_PATH was set. Avoid a duplicate to
      PATH.

commit 8c4e90fa899c97c235c9af908eeca49e6fd4a151
Author: Andy Wingo <address@hidden>
Date:   Thu Jun 10 17:13:06 2010 +0200

    uninstalled-env cleanups
    
    * meta/uninstalled-env.in: Clean up setting of GUILE_LOAD_PATH and
      GUILE_LOAD_COMPILED_PATH.

commit 875b58d240bc01eecb8c95581af2d8c94ecf19aa
Author: Andy Wingo <address@hidden>
Date:   Thu Jun 10 16:53:27 2010 +0200

    don't forget to set GUILE_SYSTEM_PATH in uninstalled mode
    
    * meta/uninstalled-env.in (GUILE_SYSTEM_PATH): Set this var too in
      uninstalled mode.

-----------------------------------------------------------------------

Summary of changes:
 meta/uninstalled-env.in |   52 ++++++++++++++++++++++++++++------------------
 1 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/meta/uninstalled-env.in b/meta/uninstalled-env.in
index 3c95153..eec648d 100644
--- a/meta/uninstalled-env.in
+++ b/meta/uninstalled-env.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-#      Copyright (C) 2003, 2006, 2008, 2009 Free Software Foundation
+#      Copyright (C) 2003, 2006, 2008, 2009, 2010 Free Software Foundation
 #
 #   This file is part of GUILE.
 #
@@ -48,20 +48,22 @@ top_builddir="@top_builddir_absolute@"
 
 if [ x"$GUILE_LOAD_PATH" = x ]
 then
+    
GUILE_LOAD_PATH="${top_srcdir}/module:${top_srcdir}:${top_srcdir}/guile-readline"
     if test "${top_srcdir}" != "${top_builddir}"; then
-        
GUILE_LOAD_PATH="${top_builddir}/guile-readline:${top_srcdir}/guile-readline:${top_builddir}:${top_srcdir}:${top_builddir}/module:${top_srcdir}/module"
-    else
-        
GUILE_LOAD_PATH="${top_srcdir}/guile-readline:${top_srcdir}:${top_srcdir}/module:${top_srcdir}/module"
+        
GUILE_LOAD_PATH="$GUILE_LOAD_PATH:${top_builddir}/module:${top_builddir}:${top_builddir}/guile-readline"
     fi
 else
-  for d in "${top_srcdir}" "${top_srcdir}/guile-readline" \
-           "${top_srcdir}/module" "${top_builddir}/module"
+  for d in "/module" "" "/guile-readline"
   do
     # This hair prevents double inclusion.
     # The ":" prevents prefix aliasing.
     case x"$GUILE_LOAD_PATH" in
-      x*${d}:*) ;;
-      *) GUILE_LOAD_PATH="${d}:$GUILE_LOAD_PATH" ;;
+      x*${top_srcdir}${d}:*) ;;
+      *) GUILE_LOAD_PATH="${top_srcdir}${d}:$GUILE_LOAD_PATH" ;;
+    esac
+    case x"$GUILE_LOAD_PATH" in
+      x*${top_builddir}${d}:*) ;;
+      *) GUILE_LOAD_PATH="${top_builddir}${d}:$GUILE_LOAD_PATH" ;;
     esac
   done
 fi
@@ -69,22 +71,26 @@ export GUILE_LOAD_PATH
 
 if [ x"$GUILE_LOAD_COMPILED_PATH" = x ]
 then
-  
GUILE_LOAD_COMPILED_PATH="${top_builddir}/guile-readline:${top_builddir}:${top_builddir}/module"
+  
GUILE_LOAD_COMPILED_PATH="${top_builddir}/module:${top_builddir}:${top_builddir}/guile-readline"
 else
-  for d in "${top_builddir}" "${top_builddir}/guile-readline" \
-           "${top_builddir}/module"
+  for d in "/module" "" "/guile-readline"
   do
     # This hair prevents double inclusion.
     # The ":" prevents prefix aliasing.
     case x"$GUILE_LOAD_COMPILED_PATH" in
-      x*${d}:*) ;;
-      *) GUILE_LOAD_COMPILED_PATH="${d}:$GUILE_LOAD_COMPILED_PATH" ;;
+      x*${top_builddir}${d}:*) ;;
+      *) 
GUILE_LOAD_COMPILED_PATH="${top_builddir}${d}:$GUILE_LOAD_COMPILED_PATH" ;;
     esac
   done
 fi
 export GUILE_LOAD_COMPILED_PATH
 
 # Don't look in installed dirs for guile modules
+if ( env | grep -v '^GUILE_SYSTEM_PATH=' > /dev/null ); then
+  GUILE_SYSTEM_PATH=
+  export GUILE_SYSTEM_PATH
+fi
+# Don't look in installed dirs for compiled guile modules
 if ( env | grep -v '^GUILE_SYSTEM_COMPILED_PATH=' > /dev/null ); then
   GUILE_SYSTEM_COMPILED_PATH=
   export GUILE_SYSTEM_COMPILED_PATH
@@ -96,15 +102,19 @@ if ( env | grep -v '^GUILE_SYSTEM_EXTENSIONS_PATH=' > 
/dev/null ); then
 fi
 
 # handle LTDL_LIBRARY_PATH (no clobber)
-ltdl_prefix=""
-dyld_prefix=""
 for dir in $subdirs_with_ltlibs ; do
-    ltdl_prefix="${top_builddir}/${dir}:${ltdl_prefix}"
-    dyld_prefix="${top_builddir}/${dir}/.libs:${dyld_prefix}"
+    if test -z "$LTDL_LIBRARY_PATH"; then
+      LTDL_LIBRARY_PATH="${top_builddir}/${dir}"
+    else
+      LTDL_LIBRARY_PATH="${top_builddir}/${dir}:${LTDL_LIBRARY_PATH}"
+    fi
+    if test -z "$DYLD_LIBRARY_PATH"; then
+      DYLD_LIBRARY_PATH="${top_builddir}/${dir}/.libs"
+    else
+      DYLD_LIBRARY_PATH="${top_builddir}/${dir}/.libs:${DYLD_LIBRARY_PATH}"
+    fi
 done
-LTDL_LIBRARY_PATH="${ltdl_prefix}$LTDL_LIBRARY_PATH"
 export LTDL_LIBRARY_PATH
-DYLD_LIBRARY_PATH="${dyld_prefix}$DYLD_LIBRARY_PATH"
 export DYLD_LIBRARY_PATH
 
 if [ x"$PKG_CONFIG_PATH" = x ]
@@ -118,7 +128,9 @@ export PKG_CONFIG_PATH
 # handle PATH (no clobber)
 PATH="${top_builddir}/libguile:${PATH}"
 PATH="${top_srcdir}/meta:${PATH}"
-PATH="${top_builddir}/meta:${PATH}"
+if "x${top_srcdir}" != "x${top_builddir}"; then
+  PATH="${top_builddir}/meta:${PATH}"
+fi
 export PATH
 
 exec "$@"


hooks/post-receive
-- 
GNU Guile