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

Don't rely on LIBDIR having been equal to SHLIBDIR on Bruce's suggestion.

Browse Source 
Set ORIG_SHLIBDIR to the expanded value of ${SHLIBDIR}, and use that
as a base to modify the new SHLIBDIR without getting infinite recursion.
This commit is contained in:
Peter Wemm 1996-09-27 12:10:14 +00:00
parent cbce68b013
commit 78a660dc23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/libgnumalloc/Makefile
View File

@ -1,7 +1,6 @@
# $Id: Makefile,v 1.6 1996/09/26 14:22:32 peter Exp $
# $Id: Makefile,v 1.7 1996/09/27 06:58:03 peter Exp $
LIB= gnumalloc
SHLIBDIR= ${LIBDIR}/compat
INTERNALLIB= yes # Do not build or install lib*.a
SHLIB_MAJOR= 2
SHLIB_MINOR= 0
@ -17,7 +16,9 @@ SRCS= cfree.c
# you to run programs that were linked with -lgnumalloc (such as XFree86).
#
beforeinstall:
rm -f ${DESTDIR}${LIBDIR}/libgnumalloc.a
rm -f ${DESTDIR}${LIBDIR}/libgnumalloc.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
rm -f ${DESTDIR}${ORIG_SHLIBDIR}/libgnumalloc.a
rm -f ${DESTDIR}${ORIG_SHLIBDIR}/libgnumalloc.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
.include <bsd.lib.mk>
ORIG_SHLIBDIR:= ${SHLIBDIR}
SHLIBDIR= ${ORIG_SHLIBDIR}/compat

7
lib/libresolv/Makefile
View File

@ -1,7 +1,6 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
LIB= resolv
SHLIBDIR= ${LIBDIR}/compat
INTERNALLIB= yes # Do not build or install libresolv*.a
SHLIB_MAJOR= 2
SHLIB_MINOR= 0
@ -19,7 +18,9 @@ SRCS= fakelib.c
# libresolv on FreeBSD-2.x **never did anything**!!
#
beforeinstall:
rm -f ${DESTDIR}${LIBDIR}/libresolv.a
rm -f ${DESTDIR}${LIBDIR}/libresolv.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
rm -f ${DESTDIR}${ORIG_SHLIBDIR}/libresolv.a
rm -f ${DESTDIR}${ORIG_SHLIBDIR}/libresolv.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
.include <bsd.lib.mk>
ORIG_SHLIBDIR:= ${SHLIBDIR}
SHLIBDIR= ${ORIG_SHLIBDIR}/compat