summaryrefslogtreecommitdiffstats
path: root/lib/libgnumalloc
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1996-09-27 12:10:14 +0000
committerpeter <peter@FreeBSD.org>1996-09-27 12:10:14 +0000
commit63b16ce89e765c8f50578150a2c6353ddaf3caf2 (patch)
tree6960a27923c7e99062c71432338d9bdaf8b36289 /lib/libgnumalloc
parent5c2e0deff2a5237abba2edafdf0fddd2b4ff6a65 (diff)
downloadFreeBSD-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.
Diffstat (limited to 'lib/libgnumalloc')
-rw-r--r--lib/libgnumalloc/Makefile9
1 files changed, 5 insertions, 4 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
OpenPOWER on IntegriCloud