From 7a0931c2bbb3817342c80f1d3cf2d56cde50f770 Mon Sep 17 00:00:00 2001
From: Nicola Pero <n.pero@mi.flashnet.it>
Date: Tue, 22 Jan 2002 23:09:04 +0000
Subject: [PATCH] No longer add framework-specific library paths; added missing
 GNUSTEP_NETWORK paths

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12194 72102866-910b-0410-8b05-ffd578937521
---
 ld_lib_path.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ld_lib_path.sh b/ld_lib_path.sh
index c0390e9b..5ec34269 100755
--- a/ld_lib_path.sh
+++ b/ld_lib_path.sh
@@ -38,11 +38,11 @@ IFS="
 if [ -z "$GNUSTEP_FLATTENED" ]; then
   last_path_part=Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO
   tool_path_part=Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS
-  lib_paths="$GNUSTEP_USER_ROOT/$last_path_part:$GNUSTEP_USER_ROOT/Library/$last_path_part:$GNUSTEP_USER_ROOT/$tool_path_part:$GNUSTEP_LOCAL_ROOT/$last_path_part:$GNUSTEP_LOCAL_ROOT/Library/$last_path_part:$GNUSTEP_LOCAL_ROOT/$tool_path_part:$GNUSTEP_SYSTEM_ROOT/$last_path_part:$GNUSTEP_SYSTEM_ROOT/Library/$last_path_part:$GNUSTEP_SYSTEM_ROOT/$tool_path_part"
+  lib_paths="$GNUSTEP_USER_ROOT/$last_path_part:$GNUSTEP_USER_ROOT/$tool_path_part:$GNUSTEP_LOCAL_ROOT/$last_path_part:$GNUSTEP_LOCAL_ROOT/$tool_path_part:$GNUSTEP_NETWORK_ROOT/$last_path_part:$GNUSTEP_NETWORK_ROOT/$tool_path_part:$GNUSTEP_SYSTEM_ROOT/$last_path_part:$GNUSTEP_SYSTEM_ROOT/$tool_path_part"
   unset last_path_part
   unset tool_path_part
 else
-  lib_paths="$GNUSTEP_USER_ROOT/Libraries:$GNUSTEP_USER_ROOT/Library/Libraries:$GNUSTEP_LOCAL_ROOT/Libraries:$GNUSTEP_LOCAL_ROOT/Library/Libraries:$GNUSTEP_SYSTEM_ROOT/Libraries:$GNUSTEP_SYSTEM_ROOT/Library/Libraries"
+  lib_paths="$GNUSTEP_USER_ROOT/Libraries:$GNUSTEP_LOCAL_ROOT/Libraries:$GNUSTEP_NETWORK_ROOT/Libraries:$GNUSTEP_SYSTEM_ROOT/Libraries"
 fi
 
 if [ -n "$GCC_SO_DIR" -a "$GCC_SO_DIR" != "NONE" ]; then
@@ -107,7 +107,7 @@ unset lib_paths
 #
 # Setup path for loading guile modules too.
 #
-guile_paths="$GNUSTEP_USER_ROOT/Libraries/Guile:$GNUSTEP_LOCAL_ROOT/Libraries/Guile:$GNUSTEP_SYSTEM_ROOT/Libraries/Guile"
+guile_paths="$GNUSTEP_USER_ROOT/Libraries/Guile:$GNUSTEP_LOCAL_ROOT/Libraries/Guile:$GNUSTEP_NETWORK_ROOT/Libraries/Guile:$GNUSTEP_SYSTEM_ROOT/Libraries/Guile"
 
 if [ -z "$GUILE_LOAD_PATH" ]; then
   GUILE_LOAD_PATH="$guile_paths"