diff options
| -rw-r--r-- | lib/libgnumalloc/Makefile | 25 | ||||
| -rw-r--r-- | lib/libgnumalloc/cfree.c | 11 |
2 files changed, 17 insertions, 19 deletions
diff --git a/lib/libgnumalloc/Makefile b/lib/libgnumalloc/Makefile index 4a06bbd..f461027 100644 --- a/lib/libgnumalloc/Makefile +++ b/lib/libgnumalloc/Makefile @@ -1,20 +1,23 @@ -# $Id: Makefile,v 1.5 1996/09/19 09:36:43 peter Exp $ +# $Id: Makefile,v 1.6 1996/09/26 14:22:32 peter Exp $ -LIB= fakegnumalloc +LIB= gnumalloc SHLIBDIR= ${LIBDIR}/compat INTERNALLIB= yes # Do not build or install lib*.a SHLIB_MAJOR= 2 SHLIB_MINOR= 0 -SRCS= fakegnumalloc.c +SRCS= cfree.c -afterinstall: - for i in ${DESTDIR}/var/db/pkg/gnumalloc* ; do \ - if [ -d $$i ] ; then exit 0 ; fi ; \ - done && \ - ( cd ${DESTDIR}${SHLIBDIR} && \ - rm -f libgnumalloc.so.${SHLIB_MAJOR}.${SHLIB_MINOR} && \ - ln -fs libfakegnumalloc.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ - libgnumalloc.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ) +# +# Before complaining about this, please *double-check* that you have +# updated the ldconfig path in /etc/rc to include /usr/lib/compat that +# was added in src/etc/rc rev 1.98. +# This is so that programs that use autoconf will not "detect" -lgnumalloc +# and continue to propagate the bogosity. The ldconfig path fix will enable +# 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} .include <bsd.lib.mk> diff --git a/lib/libgnumalloc/cfree.c b/lib/libgnumalloc/cfree.c index 4554903..5191fd6 100644 --- a/lib/libgnumalloc/cfree.c +++ b/lib/libgnumalloc/cfree.c @@ -1,10 +1,5 @@ -int -fake_a_gnumalloc_lib() +void +cfree(void *foo) { -return 1; -} - -void cfree(void *foo) -{ -free(foo); + free(foo); } |
