From cabb97dcbf9a5a7e0ce3b2cfef019afdfc9a21dc Mon Sep 17 00:00:00 2001
From: Søren Schmidt <sos@FreeBSD.org>
Date: Tue, 26 May 1998 20:12:56 +0000
Subject: ELF preparation step 2:

Move a.out libraries to /usr/lib/aout to make space for ELF libs.
Make rtld usr /usr/lib/aout as default library path.
Make ldconfig reject /usr/lib as an a.out library path.
Fix various Makefiles for LIBDIR!=/usr/lib breakage.

This will after a make world & reboot give a system that no
longer uses /usr/lib/*, infact one could remove all the old
libraries there, they are not used anymore.

We are getting close to an ELF make world, but I'll let this
all settle for a week or two...
---
 libexec/rtld-aout/rtld.c  | 4 ++--
 libexec/rtld-aout/shlib.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'libexec/rtld-aout')

diff --git a/libexec/rtld-aout/rtld.c b/libexec/rtld-aout/rtld.c
index 342ed74be07c..2897302729d9 100644
--- a/libexec/rtld-aout/rtld.c
+++ b/libexec/rtld-aout/rtld.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: rtld.c,v 1.51 1997/12/05 02:06:37 jdp Exp $
+ *	$Id: rtld.c,v 1.52 1998/02/06 16:46:46 jdp Exp $
  */
 
 #include <sys/param.h>
@@ -1965,7 +1965,7 @@ __dlsym(fd, sym)
 {
 	if (fd == RTLD_NEXT) {
 		generror("RTLD_NEXT not supported by this version of"
-		    " /usr/lib/crt0.o");
+		    " crt0.o");
 		return NULL;
 	}
 	return __dlsym3(fd, sym, NULL);
diff --git a/libexec/rtld-aout/shlib.c b/libexec/rtld-aout/shlib.c
index efb0bb665bf8..be92dffa5434 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$
+ *	$Id: shlib.c,v 1.18 1997/02/22 15:46:24 peter Exp $
  */
 
 #include <sys/param.h>
@@ -52,7 +52,7 @@
  * Standard directories to search for files specified by -l.
  */
 #ifndef STANDARD_SEARCH_DIRS
-#define STANDARD_SEARCH_DIRS    "/usr/lib"
+#define STANDARD_SEARCH_DIRS    "/usr/lib/aout"
 #endif
 
 /*
-- 
cgit v1.3