diff options
| author | peter <peter@FreeBSD.org> | 1998-10-11 04:39:56 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1998-10-11 04:39:56 +0000 |
| commit | aa6e892d938b191aa20ababd311241236bcab32e (patch) | |
| tree | 7fc60adafc03fc9b5c7ee690d096180522d9a63c /lib/libtermcap | |
| parent | 62cc2c59c03368b1a26687f4b6f3948c5644f221 (diff) | |
| download | FreeBSD-src-aa6e892d938b191aa20ababd311241236bcab32e.zip FreeBSD-src-aa6e892d938b191aa20ababd311241236bcab32e.tar.gz | |
Deal with /usr/lib/compat/aout, and that we've been installing things
in the wrong places for a while.
Also, the the libtermlib.so -> libtermcap.so manually for elf, otherwise
the hard link follows the symlink and the result looks rather wierd. The
*.a files are still hard linked under elf as before.
Diffstat (limited to 'lib/libtermcap')
| -rw-r--r-- | lib/libtermcap/Makefile | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/lib/libtermcap/Makefile b/lib/libtermcap/Makefile index 23aa8eb..73abe15 100644 --- a/lib/libtermcap/Makefile +++ b/lib/libtermcap/Makefile @@ -12,14 +12,10 @@ MLINKS= termcap.3 tgetent.3 termcap.3 tgetflag.3 termcap.3 tgetnum.3 \ termcap.3 tparm.3 termcap.3 __set_ospeed.3 LINKS= ${LIBDIR}/libtermcap.a ${LIBDIR}/libtermlib.a -.if !defined(NOPIC) .if ${OBJFORMAT} == aout +.if !defined(NOPIC) LINKS+= ${SHLIBDIR}/libtermcap.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ ${SHLIBDIR}/libtermlib.so.${SHLIB_MAJOR}.${SHLIB_MINOR} -.else -# no need for major at all, it's an ld-time redirection only -LINKS+= ${SHLIBDIR}/libtermcap.so \ - ${SHLIBDIR}/libtermlib.so .endif .endif .if !defined(NOPROFILE) @@ -30,18 +26,23 @@ beforeinstall: ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/termcap.h \ ${DESTDIR}/usr/include -.if ${OBJFORMAT} == aout # 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 +.if !defined(NOPIC) +.if ${OBJFORMAT} == aout +.for lib in libtermcap libtermlib + rm -f ${DESTDIR}/usr/lib/compat/${lib}.so.3.0 + rm -f ${DESTDIR}/usr/lib/compat/aout/${lib}.so.3.0 + ln -s ${SHLIBDIR}/${lib}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ + ${DESTDIR}/usr/lib/compat/aout/${lib}.so.3.0 + rm -f ${DESTDIR}${SHLIBDIR}/${lib}.so.3.0 .endfor .endif +.if ${OBJFORMAT} == elf + rm -f ${DESTDIR}${SHLIBDIR}/libtermlib.so + ln -s libtermcap.so.${SHLIB_MAJOR} ${DESTDIR}${SHLIBDIR}/libtermlib.so +.endif .endif .include <bsd.lib.mk> |
