Date: Fri, 12 Jun 1998 07:38:02 +0100 (BST) From: Doug Rabson <dfr@nlsystems.com> To: Amancio Hasty <hasty@rah.star-gate.com> Cc: current@FreeBSD.ORG Subject: Re: libtermcap and elf :( Message-ID: <Pine.BSF.3.95q.980612073707.351R-100000@herring.nlsystems.com> In-Reply-To: <199806120516.WAA14589@rah.star-gate.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, 11 Jun 1998, Amancio Hasty wrote: > > Every time I tried to install elf /usr/src/lib , I get this: > > ===> libtermcap > install -C -o bin -g bin -m 444 /usr/src/lib/libtermcap/termcap.h /usr/include > install -c -o bin -g bin -m 444 libtermcap.a /usr/lib > install -c -o bin -g bin -m 444 libtermcap.so.2 /usr/lib > ln -sf libtermcap.so.2 /usr/lib/libtermcap.so > /usr/lib/libtermlib.a -> /usr/lib/libtermcap.a > /usr/lib/libtermlib.so.2.1 -> /usr/lib/libtermcap.so.2.1 > ln: /usr/lib/libtermcap.so.2.1: No such file or directory > *** Error code 1 I had this and made this patch. It seemed a bit hacky so I never mentioned it: Index: Makefile =================================================================== RCS file: /home/ncvs/src/lib/libtermcap/Makefile,v retrieving revision 1.22 diff -u -r1.22 Makefile --- Makefile 1997/12/19 22:11:29 1.22 +++ Makefile 1998/04/10 08:20:00 @@ -12,9 +12,17 @@ termcap.3 tparm.3 termcap.3 __set_ospeed.3 LINKS= ${LIBDIR}/libtermcap.a ${LIBDIR}/libtermlib.a .if !defined(NOPIC) +.if ${BINFORMAT} == aout LINKS+= ${SHLIBDIR}/libtermcap.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ ${SHLIBDIR}/libtermlib.so.${SHLIB_MAJOR}.${SHLIB_MINOR} .endif +.if ${BINFORMAT} == elf +LINKS+= ${SHLIBDIR}/libtermcap.so.${SHLIB_MAJOR} \ + ${SHLIBDIR}/libtermlib.so.${SHLIB_MAJOR} +LINKS+= ${SHLIBDIR}/libtermcap.so \ + ${SHLIBDIR}/libtermlib.so +.endif +.endif .if !defined(NOPROFILE) LINKS+= ${LIBDIR}/libtermcap_p.a ${LIBDIR}/libtermlib_p.a .endif @@ -25,6 +33,7 @@ # 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 ${BINFORMAT} != elf .if !defined(NOPIC) afterinstall: .for lib in libtermcap.so libtermlib.so @@ -33,6 +42,7 @@ ${DESTDIR}/usr/lib/compat/${lib}.3.0 rm -f ${DESTDIR}${SHLIBDIR}/${lib}.3.0 .endfor +.endif .endif .include <bsd.lib.mk> -- Doug Rabson Mail: dfr@nlsystems.com Nonlinear Systems Ltd. Phone: +44 181 951 1891 Fax: +44 181 381 1039 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.3.95q.980612073707.351R-100000>