diff options
| author | peter <peter@FreeBSD.org> | 1998-10-11 04:21:56 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1998-10-11 04:21:56 +0000 |
| commit | 62cc2c59c03368b1a26687f4b6f3948c5644f221 (patch) | |
| tree | ededa5387807ca512d4c80647313fbcd4bdd87d9 | |
| parent | ccf40b66e021ace4bb87f356c78651f68fea9b80 (diff) | |
| download | FreeBSD-src-62cc2c59c03368b1a26687f4b6f3948c5644f221.zip FreeBSD-src-62cc2c59c03368b1a26687f4b6f3948c5644f221.tar.gz | |
Don't build elf libresolv.so*, no elf freebsd binaries have used it ever.
Also, the a.out compat version is supposed to go into /usr/lib/compat/aout.
Try and clean up the mess left behind in /usr/lib/compat.
| -rw-r--r-- | lib/libresolv/Makefile | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/lib/libresolv/Makefile b/lib/libresolv/Makefile index 69dcbe8..118b757 100644 --- a/lib/libresolv/Makefile +++ b/lib/libresolv/Makefile @@ -7,6 +7,10 @@ SHLIB_MINOR= 0 SRCS= fakelib.c +.if ${OBJFORMAT} != aout +NOPIC= true +.endif + # # Before complaining about this, please *double-check* that you have # updated the ldconfig path in /etc/rc to include /usr/lib/compat that @@ -19,8 +23,11 @@ SRCS= fakelib.c # beforeinstall: rm -f ${DESTDIR}${LIBDIR}/lib${LIB}.a \ - ${DESTDIR}${LIBDIR}/lib${LIB}_p.a \ - ${DESTDIR}${ORIG_SHLIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} + ${DESTDIR}${LIBDIR}/lib${LIB}_p.a \ + ${DESTDIR}${ORIG_SHLIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ + ${DESTDIR}/usr/lib/compat/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ + ${DESTDIR}/usr/lib/compat/lib${LIB}.so.${SHLIB_MAJOR} \ + ${DESTDIR}/usr/lib/compat/lib${LIB}.so .include <bsd.lib.mk> @@ -29,4 +36,4 @@ ORIG_SHLIBDIR:= ${SHLIBDIR} # The ldconfig line in/etc/rc doesn't depend on ${LIBDIR} or ${SHLIBDIR}, # so neither does this. -SHLIBDIR= /usr/lib/compat +SHLIBDIR= /usr/lib/compat/aout |
