Peter must be sick of this, so I changed it directly. Fixed:

- old static non-profiled libraries were removed in the wrong directory
  if ${ORIG_SHLIBDIR} != ${LIBDIR}.
- old profiled libraries weren't removed.
- new shared compat libraries were installed in the wrong directory if
  ${ORIG_SHLIBDIR} != /usr/lib.
- some lines were too long.
Added some comments about cases that have caused problems.  Changed
libfoo to ${LIB} so that libresolv/Makefile and libgnumalloc/Makefile
are almost identical.

1 files changed, 9 insertions, 4 deletions

diff --git a/lib/libresolv/Makefile b/lib/libresolv/Makefile
index c51cde8..9a3fca4 100644
--- a/lib/libresolv/Makefile
+++ b/lib/libresolv/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 
 LIB=		resolv
-INTERNALLIB=	yes		# Do not build or install libresolv*.a
+INTERNALLIB=	yes		# Do not build or install ${LIB}*.a
 SHLIB_MAJOR=	2
 SHLIB_MINOR=	0
 
@@ -18,9 +18,14 @@ SRCS=	fakelib.c
 # libresolv on FreeBSD-2.x **never did anything**!!
 #
 beforeinstall:
-	rm -f ${DESTDIR}${ORIG_SHLIBDIR}/libresolv.a
-	rm -f ${DESTDIR}${ORIG_SHLIBDIR}/libresolv.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
+	rm -f ${DESTDIR}${LIBDIR}/${LIB}.a ${DESTDIR}${LIBDIR}/${LIB}_p.a \
+	    ${DESTDIR}${ORIG_SHLIBDIR}/${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
 
 .include <bsd.lib.mk>
+
+# This must follow the .include in case SHLIBDIR is defined there.
 ORIG_SHLIBDIR:=	${SHLIBDIR}
-SHLIBDIR=	${ORIG_SHLIBDIR}/compat
+
+# The ldconfig line in/etc/rc doesn't depend on ${LIBDIR} or ${SHLIBDIR},
+# so neither does this.
+SHLIBDIR=	/usr/lib/compat