From 9b8ba91c4fd5fdfadb375af5296e2915e1044cfd Mon Sep 17 00:00:00 2001 From: bde Date: Fri, 19 Dec 1997 22:11:29 +0000 Subject: [PATCH] Fixed the termcap 3.0 hacks. They were very broken in my configuration where shared libraries are in /lib and almost everything is linked shared. First, they removed the old shared library before installing the new one. Second, they attemped a cross-device link from /lib to /usr/lib/compat. --- lib/libtermcap/Makefile | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/lib/libtermcap/Makefile b/lib/libtermcap/Makefile index c33919687130..632de37d635c 100644 --- a/lib/libtermcap/Makefile +++ b/lib/libtermcap/Makefile @@ -19,19 +19,20 @@ LINKS+= ${SHLIBDIR}/libtermcap.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ LINKS+= ${LIBDIR}/libtermcap_p.a ${LIBDIR}/libtermlib_p.a .endif -# This is a hack.. Work around a major number bump that should have been -# done differently. Back out this delta when it's time to go to 3.0 for real. -.if !defined(NOPIC) -LINKS+= ${SHLIBDIR}/libtermcap.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ - /usr/lib/compat/libtermcap.so.3.0 -LINKS+= ${SHLIBDIR}/libtermcap.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ - /usr/lib/compat/libtermlib.so.3.0 -.endif - beforeinstall: ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/termcap.h \ ${DESTDIR}/usr/include - rm -f ${DESTDIR}${SHLIBDIR}/libtermcap.so.3.0 \ - ${DESTDIR}${SHLIBDIR}/libtermlib.so.3.0 + +# This is a hack.. Work around a major number bump that should have been +# done differently. Back out this delta when it's time to go to 3.0 for real. +.if !defined(NOPIC) +afterinstall: +.for lib in libtermcap.so libtermlib.so + rm -f ${DESTDIR}/usr/lib/compat/${lib}.3.0 + ln -s ${SHLIBDIR}/${lib}.${SHLIB_MAJOR}.${SHLIB_MINOR} \ + ${DESTDIR}/usr/lib/compat/${lib}.3.0 + rm -f ${DESTDIR}${SHLIBDIR}/${lib}.3.0 +.endfor +.endif .include