Date: Mon, 15 Apr 2002 15:24:15 +0400 From: "Andrey A. Chernov" <ache@nagual.pp.ru> To: Ruslan Ermilov <ru@FreeBSD.org> Cc: Bruce Evans <bde@FreeBSD.org>, cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/gnu/lib/libreadline/readline Makefile Message-ID: <20020415112415.GA22417@nagual.pp.ru> In-Reply-To: <20020415082011.GA11264@sunbay.com> References: <200204091302.g39D2QV05151@freefall.freebsd.org> <20020412113309.GA1551@nagual.pp.ru> <20020412114540.GB27751@sunbay.com> <20020412115414.GC1551@nagual.pp.ru> <20020412142553.GA45365@sunbay.com> <20020412151224.GA8492@nagual.pp.ru> <20020415065538.GB2452@sunbay.com> <20020415073549.GA19816@nagual.pp.ru> <20020415082011.GA11264@sunbay.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
On Mon, Apr 15, 2002 at 11:20:11 +0300, Ruslan Ermilov wrote:
> So please fix it so that we have a real termcap library appearing
> under /usr/lib with "termcap.so" as an internal name. It does not
> matter if the actual contents is equivalent to ncurses.so -- that
> would be an implementation detail. I would be more than happy to
> back out my change then.
Ok, how about this patch?
Index: Makefile
===================================================================
RCS file: /home/ncvs/src/lib/libncurses/Makefile,v
retrieving revision 1.52
diff -u -r1.52 Makefile
--- Makefile 14 Sep 2001 15:27:51 -0000 1.52
+++ Makefile 15 Apr 2002 11:21:33 -0000
@@ -223,9 +223,9 @@
.if ${OBJFORMAT} == aout
SYMLINKS+=libncurses.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
libcurses.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
-SYMLINKS+=libncurses.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
- libtermcap.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
-SYMLINKS+=libncurses.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
+LINKS+=${SHLIBDIR}/libncurses.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
+ ${SHLIBDIR}libtermcap.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
+SYMLINKS+=libtermcap.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
libtermlib.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
SYMLINKS+=libncurses.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
libmytinfo.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
@@ -234,8 +234,8 @@
.else
# no need for major at all, it's an ld-time redirection only
SYMLINKS+=libncurses.so ${SHLIBDIR}/libcurses.so
-SYMLINKS+=libncurses.so ${SHLIBDIR}/libtermcap.so
-SYMLINKS+=libncurses.so ${SHLIBDIR}/libtermlib.so
+LINKS+=${SHLIBDIR}/libncurses.so ${SHLIBDIR}/libtermcap.so
+SYMLINKS+=libtermcap.so ${SHLIBDIR}/libtermlib.so
SYMLINKS+=libncurses.so ${SHLIBDIR}/libmytinfo.so
SYMLINKS+=libncurses.so ${SHLIBDIR}/libtinfo.so
.endif
--
Andrey A. Chernov
http://ache.pp.ru/
[-- Attachment #2 --]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (FreeBSD)
Comment: For info see http://www.gnupg.org
iQCVAwUBPLq4XuJgpPLZnQjrAQETlAQA7GreeMmcbzP/rQfPpuyKueEhN6N9X5yW
U5Ckbqvj0rxC6PXmjcohDpT7V+yI0Jc+4CtHMyALXZJYg+FPUofujxtzVPbrwrFo
b4wSQPLDJNZi5G57gT7XLhIRIwP2XzmyYyx8GOBbPQCZ8YKPJM+SwvjyaypIkMa4
v2Ffd95lLtA=
=VR8e
-----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020415112415.GA22417>