d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
- 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.
This commit is contained in:
Bruce Evans 1996-09-27 16:22:49 +00:00
parent fab94ac15b
commit b017ff4eb8
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/libgnumalloc/Makefile
View File

@ -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

13
lib/libresolv/Makefile
View File

@ -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