diff options
| author | peter <peter@FreeBSD.org> | 1996-09-27 12:10:14 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1996-09-27 12:10:14 +0000 |
| commit | 63b16ce89e765c8f50578150a2c6353ddaf3caf2 (patch) | |
| tree | 6960a27923c7e99062c71432338d9bdaf8b36289 | |
| parent | 5c2e0deff2a5237abba2edafdf0fddd2b4ff6a65 (diff) | |
| download | FreeBSD-src-63b16ce89e765c8f50578150a2c6353ddaf3caf2.zip FreeBSD-src-63b16ce89e765c8f50578150a2c6353ddaf3caf2.tar.gz | |
Don't rely on LIBDIR having been equal to SHLIBDIR on Bruce's suggestion.
Set ORIG_SHLIBDIR to the expanded value of ${SHLIBDIR}, and use that
as a base to modify the new SHLIBDIR without getting infinite recursion.
| -rw-r--r-- | lib/libgnumalloc/Makefile | 9 | ||||
| -rw-r--r-- | lib/libresolv/Makefile | 7 |
2 files changed, 9 insertions, 7 deletions
diff --git a/lib/libgnumalloc/Makefile b/lib/libgnumalloc/Makefile index f461027..ca6b574 100644 --- a/lib/libgnumalloc/Makefile +++ b/lib/libgnumalloc/Makefile @@ -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 diff --git a/lib/libresolv/Makefile b/lib/libresolv/Makefile index 5692b7d..c51cde8 100644 --- a/lib/libresolv/Makefile +++ b/lib/libresolv/Makefile @@ -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 |
