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...

3 files changed, 11 insertions, 6 deletions

diff --git a/gnu/usr.bin/ld/ldconfig/ldconfig.c b/gnu/usr.bin/ld/ldconfig/ldconfig.c
index 1f54178..096ce52 100644
--- a/gnu/usr.bin/ld/ldconfig/ldconfig.c
+++ b/gnu/usr.bin/ld/ldconfig/ldconfig.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: ldconfig.c,v 1.19 1997/07/11 14:45:41 jkh Exp $
+ *	$Id: ldconfig.c,v 1.20 1997/08/22 04:42:12 peter Exp $
  */
 
 #include <sys/param.h>
@@ -146,7 +146,12 @@ char	*argv[];
 			if (stat(argv[i], &stbuf) == -1) {
 				warn("%s", argv[i]);
 				rval = -1;
-			} else {
+			}
+		        else if (!strcmp(argv[i], "/usr/lib")) {
+				warnx("WARNING! '%s' can not be used", argv[i]);
+				rval = -1;
+			}
+			else  {
 				/*
 				 * See if this is a directory-containing
 				 * file instead of a directory
diff --git a/gnu/usr.bin/ld/rtld/rtld.c b/gnu/usr.bin/ld/rtld/rtld.c
index 342ed74..2897302 100644
--- a/gnu/usr.bin/ld/rtld/rtld.c
+++ b/gnu/usr.bin/ld/rtld/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/gnu/usr.bin/ld/shlib.c b/gnu/usr.bin/ld/shlib.c
index efb0bb6..be92dff 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$
+ *	$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
 
 /*