From 8af57ca9dd30af782c907fcbbfbe348f82644f9d Mon Sep 17 00:00:00 2001 From: Nate Williams Date: Sun, 19 Mar 1995 21:20:09 +0000 Subject: [PATCH] Removed /usr/local/lib from the standard library search path to be consistant. Programs shouldn't rely on non-standard paths for bringing in default libraries. Suggested by: Andreas Schulz --- gnu/usr.bin/ld/shlib.c | 4 ++-- libexec/rtld-aout/shlib.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/usr.bin/ld/shlib.c b/gnu/usr.bin/ld/shlib.c index 38cb2d1ad94c..f256508b55d7 100644 --- a/gnu/usr.bin/ld/shlib.c +++ b/gnu/usr.bin/ld/shlib.c @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: shlib.c,v 1.11 1995/01/05 02:36:29 swallace Exp $ + * $Id: shlib.c,v 1.12 1995/03/04 17:46:09 nate Exp $ */ #include @@ -54,7 +54,7 @@ char *strsep(); * Standard directories to search for files specified by -l. */ #ifndef STANDARD_SEARCH_DIRS -#define STANDARD_SEARCH_DIRS "/usr/lib", "/usr/local/lib" +#define STANDARD_SEARCH_DIRS "/usr/lib" #endif /* diff --git a/libexec/rtld-aout/shlib.c b/libexec/rtld-aout/shlib.c index 38cb2d1ad94c..f256508b55d7 100644 --- a/libexec/rtld-aout/shlib.c +++ b/libexec/rtld-aout/shlib.c @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: shlib.c,v 1.11 1995/01/05 02:36:29 swallace Exp $ + * $Id: shlib.c,v 1.12 1995/03/04 17:46:09 nate Exp $ */ #include @@ -54,7 +54,7 @@ char *strsep(); * Standard directories to search for files specified by -l. */ #ifndef STANDARD_SEARCH_DIRS -#define STANDARD_SEARCH_DIRS "/usr/lib", "/usr/local/lib" +#define STANDARD_SEARCH_DIRS "/usr/lib" #endif /*