X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=misc%2Fshlib;h=6817a0d70eafee0f0249bd878aa4a6081a1c61ef;hp=1845a62e51ee620e9337ed4e1f26a9b49abd55cb;hb=46722468f47c2b77b3987729b4bcf2321cccfd01;hpb=661078ddbde3ce0f3b06e95642fbb9b5fef7dca1

diff --git a/misc/shlib b/misc/shlib
index 1845a62e..6817a0d7 100755
--- a/misc/shlib
+++ b/misc/shlib
@@ -1,6 +1,6 @@
 #!/bin/sh
 ##############################################################################
-# Copyright (c) 1998 Free Software Foundation, Inc.                          #
+# Copyright (c) 1998,2000 Free Software Foundation, Inc.                     #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
@@ -29,7 +29,7 @@
 #
 # Author: Thomas E. Dickey <dickey@clark.net> 1996
 #
-# $Id: shlib,v 1.4 1998/02/11 12:13:50 tom Exp $
+# $Id: shlib,v 1.6 2000/05/20 23:01:17 tom Exp $
 # Use this script as a wrapper when running executables linked to shared
 # libraries on systems that use the $LD_LIBRARY_PATH variable and don't embed
 # the soname's path within the linked executable (such as IRIX), e.g,
@@ -55,6 +55,18 @@
 # Using a conventional link, with -L and -l options on Linux results in a
 # statically linked executable, which we don't want at all.
 #
+# Special cases:
+#
+#	BeOS R4.5 uses $LIBRARY_PATH rather than $LD_LIBRARY_PATH.
+
+#
+# Make sure that we use the PATH that was set in run_tic.sh
+#
+if test X$NEWPATH != X ; then
+	PATH=$NEWPATH
+	export PATH
+fi
+
 q=""
 for p in lib ../lib
 do
@@ -65,6 +77,8 @@ done
 if test -n "$q" ; then
 	if test -n "$LD_LIBRARY_PATH"; then
 		LD_LIBRARY_PATH="$q:$LD_LIBRARY_PATH"
+	elif test -n "$LIBRARY_PATH" ; then
+		LIBRARY_PATH="$q:$LIBRARY_PATH"
 	else
 		LD_LIBRARY_PATH="$q"
 	fi