diff options
author | bde <bde@FreeBSD.org> | 1996-09-27 16:22:49 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1996-09-27 16:22:49 +0000 |
commit | 0a7f8a57ed6dbb1ec5259e73c793c76a6f3f7ac5 (patch) | |
tree | 34cc72dff210ba3f3d20fdb986d0e9bc30992548 /lib/libgnumalloc | |
parent | 331ec6879be6807dad9f67efa5906b3f1881198e (diff) | |
download | FreeBSD-src-0a7f8a57ed6dbb1ec5259e73c793c76a6f3f7ac5.zip FreeBSD-src-0a7f8a57ed6dbb1ec5259e73c793c76a6f3f7ac5.tar.gz |
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.
Diffstat (limited to 'lib/libgnumalloc')
-rw-r--r-- | lib/libgnumalloc/Makefile | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/lib/libgnumalloc/Makefile b/lib/libgnumalloc/Makefile index ca6b574..4423124 100644 --- a/lib/libgnumalloc/Makefile +++ b/lib/libgnumalloc/Makefile @@ -1,7 +1,7 @@ -# $Id: Makefile,v 1.7 1996/09/27 06:58:03 peter Exp $ +# $Id: Makefile,v 1.8 1996/09/27 12:10:08 peter Exp $ LIB= gnumalloc -INTERNALLIB= yes # Do not build or install lib*.a +INTERNALLIB= yes # Do not build or install ${LIB}*.a SHLIB_MAJOR= 2 SHLIB_MINOR= 0 @@ -16,9 +16,14 @@ SRCS= cfree.c # you to run programs that were linked with -lgnumalloc (such as XFree86). # beforeinstall: - rm -f ${DESTDIR}${ORIG_SHLIBDIR}/libgnumalloc.a - rm -f ${DESTDIR}${ORIG_SHLIBDIR}/libgnumalloc.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> -ORIG_SHLIBDIR:= ${SHLIBDIR} -SHLIBDIR= ${ORIG_SHLIBDIR}/compat + +# This must follow the .include in case SHLIBDIR is defined there. +ORIG_SHLIBDIR:= ${SHLIBDIR} + +# The ldconfig line in/etc/rc doesn't depend on ${LIBDIR} or ${SHLIBDIR}, +# so neither does this. +SHLIBDIR= /usr/lib/compat |