diff options
| author | sos <sos@FreeBSD.org> | 1998-05-26 20:12:56 +0000 |
|---|---|---|
| committer | sos <sos@FreeBSD.org> | 1998-05-26 20:12:56 +0000 |
| commit | bc60c8025eefe519b725f9a4d278ec3e887f7e00 (patch) | |
| tree | 37210576f0aee50d6bf52bcf2871ece5963fc993 /usr.bin | |
| parent | 37218a27856974855d62695874c9a46e494374dc (diff) | |
| download | FreeBSD-src-bc60c8025eefe519b725f9a4d278ec3e887f7e00.zip FreeBSD-src-bc60c8025eefe519b725f9a4d278ec3e887f7e00.tar.gz | |
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...
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/doscmd/Makefile | 6 | ||||
| -rw-r--r-- | usr.bin/objformat/Makefile | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/usr.bin/doscmd/Makefile b/usr.bin/doscmd/Makefile index c7d580a..55938ab 100644 --- a/usr.bin/doscmd/Makefile +++ b/usr.bin/doscmd/Makefile @@ -1,6 +1,6 @@ # from BSDI Makefile,v 2.6 1996/04/08 20:06:40 bostic Exp # -# $Id: Makefile,v 1.9 1997/12/16 16:36:43 bde Exp $ +# $Id: Makefile,v 1.10 1998/03/21 12:51:44 bde Exp $ PROG= doscmd SRCS= AsyncIO.c ParseBuffer.c bios.c callback.c cpu.c dos.c cmos.c config.c \ @@ -23,7 +23,7 @@ DPADD= ${X11BASE}/lib/libX11.a .else CFLAGS+= -I. -DDISASSEMBLER -DNO_X .endif -LDADD+= -lgcc -lc +LDADD+= -L${DESTDIR}/${LIBDIR} -lgcc -lc DPADD+= ${LIBGCC} ${LIBC} beforeinstall: @@ -34,7 +34,7 @@ beforeinstall: doscmd: ${LIBCRT0} doscmd_loader.o ${LIBGCC} ${LIBC} ld -e start -dc -dp ${LDFLAGS:M-static:S/-static/-Bstatic/} \ - -o doscmd ${LIBCRT0} doscmd_loader.o -lgcc -lc + -o doscmd ${LIBCRT0} doscmd_loader.o -L${DESTDIR}/${LIBDIR} -lgcc -lc # Bogusly generated dependency to get doscmd_loader.c looked at by mkdep. .depend: doscmd_loader.c diff --git a/usr.bin/objformat/Makefile b/usr.bin/objformat/Makefile index f30520f..279d691 100644 --- a/usr.bin/objformat/Makefile +++ b/usr.bin/objformat/Makefile @@ -17,13 +17,13 @@ install: chown ${BINOWN} ${DESTDIR}/usr/bin/objformat chgrp ${BINGRP} ${DESTDIR}/usr/bin/objformat chmod ${BINMODE} ${DESTDIR}/usr/bin/objformat - ln -s ${DESTDIR}/usr/bin/objformat ${DESTDIR}/usr/bin/ar - ln -s ${DESTDIR}/usr/bin/objformat ${DESTDIR}/usr/bin/as - ln -s ${DESTDIR}/usr/bin/objformat ${DESTDIR}/usr/bin/ld - ln -s ${DESTDIR}/usr/bin/objformat ${DESTDIR}/usr/bin/nm - ln -s ${DESTDIR}/usr/bin/objformat ${DESTDIR}/usr/bin/ranlib - ln -s ${DESTDIR}/usr/bin/objformat ${DESTDIR}/usr/bin/size - ln -s ${DESTDIR}/usr/bin/objformat ${DESTDIR}/usr/bin/strings - ln -s ${DESTDIR}/usr/bin/objformat ${DESTDIR}/usr/bin/strip + ln -sf ${DESTDIR}/usr/bin/objformat ${DESTDIR}/usr/bin/ar + ln -sf ${DESTDIR}/usr/bin/objformat ${DESTDIR}/usr/bin/as + ln -sf ${DESTDIR}/usr/bin/objformat ${DESTDIR}/usr/bin/ld + ln -sf ${DESTDIR}/usr/bin/objformat ${DESTDIR}/usr/bin/nm + ln -sf ${DESTDIR}/usr/bin/objformat ${DESTDIR}/usr/bin/ranlib + ln -sf ${DESTDIR}/usr/bin/objformat ${DESTDIR}/usr/bin/size + ln -sf ${DESTDIR}/usr/bin/objformat ${DESTDIR}/usr/bin/strings + ln -sf ${DESTDIR}/usr/bin/objformat ${DESTDIR}/usr/bin/strip .include <bsd.prog.mk> |
