ELF preparation step 1:

Move our old a.out utils to /usr/libexec/aout.
Enable binutils and put the utils in /usr/libexec/elf
Enable objformat, a little helper program that calls the right
utils based on /etc/objformat and $OBJFORMAT.

This will enable the ELF generating tools.
Remember that this is only step one, the system is still compiled
and run in a.out format ONLY.

Problem left to solve: The BSD manpages wins over the GNU equivalents
as the are installed last. We need to distinguish between the manpages
somehow...

7 files changed, 10 insertions, 4 deletions

diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 06ac4143feb6..a880524aab89 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 1/7/94
-#	$Id: Makefile,v 1.98 1998/04/14 07:40:47 peter Exp $
+#	$Id: Makefile,v 1.99 1998/05/15 12:33:56 jb Exp $
 
 # XXX MISSING:		deroff diction graph learn plot
 #			spell spline struct xsend
@@ -16,9 +16,9 @@ SUBDIR=	apply at banner basename biff c89 calendar \
 	join jot key keyinfo keyinit keylogin keylogout killall kzip \
 	lam last lastcomm leave lex limits locate lock lockf logger login \
 	logname look lsvfs m4 mail make mesg mkdep mkfifo mklocale mkstr \
-	mktemp mk_cmds more msgs ncal newkey nice \
-	nohup opieinfo opiekey opiepasswd pagesize passwd paste pr printenv \
-	printf quota rdist renice rev rlogin rpcgen \
+	mktemp mk_cmds more msgs ncal newkey nice nohup \
+	objformat opieinfo opiekey opiepasswd pagesize passwd paste pr \
+	printenv printf quota rdist renice rev rlogin rpcgen \
 	rpcinfo rs rsh rup ruptime rusers rwall \
 	rwho script sed shar showmount soelim split \
 	su symorder tail talk tconv tcopy tee tftp time \
diff --git a/usr.bin/ar/Makefile b/usr.bin/ar/Makefile
index 94bb84f9685d..04ae9223fc65 100644
--- a/usr.bin/ar/Makefile
+++ b/usr.bin/ar/Makefile
@@ -1,6 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	ar
+BINDIR=	/usr/libexec/aout
 CFLAGS+=-I${.CURDIR}
 SRCS=	append.c ar.c archive.c contents.c delete.c extract.c misc.c \
 	move.c print.c replace.c
diff --git a/usr.bin/nm/Makefile b/usr.bin/nm/Makefile
index 5266202b768d..20cd64ebaa95 100644
--- a/usr.bin/nm/Makefile
+++ b/usr.bin/nm/Makefile
@@ -1,5 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	nm
+BINDIR= /usr/libexec/aout
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/ranlib/Makefile b/usr.bin/ranlib/Makefile
index a6382a629d87..452c61de7235 100644
--- a/usr.bin/ranlib/Makefile
+++ b/usr.bin/ranlib/Makefile
@@ -1,6 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	ranlib
+BINDIR= /usr/libexec/aout
 SRCS=	archive.c build.c misc.c ranlib.c touch.c
 CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../ar
 MAN1=	ranlib.1
diff --git a/usr.bin/size/Makefile b/usr.bin/size/Makefile
index 3ad91be22f8c..5c35df334125 100644
--- a/usr.bin/size/Makefile
+++ b/usr.bin/size/Makefile
@@ -1,5 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	size
+BINDIR= /usr/libexec/aout
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/strings/Makefile b/usr.bin/strings/Makefile
index 87f557ddbae4..7a848497a414 100644
--- a/usr.bin/strings/Makefile
+++ b/usr.bin/strings/Makefile
@@ -1,5 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	strings
+BINDIR= /usr/libexec/aout
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/strip/Makefile b/usr.bin/strip/Makefile
index 3d19864f4c22..99118925a911 100644
--- a/usr.bin/strip/Makefile
+++ b/usr.bin/strip/Makefile
@@ -1,6 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	strip
+BINDIR= /usr/libexec/aout
 MAN1=	strip.1
 CLEANFILES += maybe_stripped