From 8383ce3c1a03e9cf0449d48dcbd14cc8c49476b1 Mon Sep 17 00:00:00 2001 From: jlam Date: Fri, 27 Jul 2001 14:31:44 +0000 Subject: Set REPLACE_LIBNAMES_SED in cases where BUILDLINK_TRANSFORM will be invoked to replace buildlinked library names with the true library names. --- devel/ncurses/buildlink.mk | 6 +++--- devel/readline/buildlink.mk | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'devel') diff --git a/devel/ncurses/buildlink.mk b/devel/ncurses/buildlink.mk index 6df8858825d..17e91a84760 100644 --- a/devel/ncurses/buildlink.mk +++ b/devel/ncurses/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.8 2001/07/27 13:33:25 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.9 2001/07/27 14:31:44 jlam Exp $ # # This Makefile fragment is included by packages that use ncurses. # @@ -73,10 +73,10 @@ BUILDLINK_FILES.ncurses+= include/unctrl.h BUILDLINK_FILES.ncurses+= lib/libcurses.* BUILDLINK_FILES.ncurses+= lib/libform.* BUILDLINK_FILES.ncurses+= lib/libmenu.* -.endif - BUILDLINK_TRANSFORM.ncurses= -e "s|libcurses\.|libncurses.|g" BUILDLINK_TRANSFORM.ncurses+= -e "s|/curses.h|/ncurses.h|g" +REPLACE_LIBNAMES_SED+= -e "s|-lncurses|-lcurses|g" +.endif BUILDLINK_TARGETS.ncurses+= ncurses-buildlink .if ${_NEED_NCURSES} == "NO" diff --git a/devel/readline/buildlink.mk b/devel/readline/buildlink.mk index 816c8196f3a..90a972773e4 100644 --- a/devel/readline/buildlink.mk +++ b/devel/readline/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.15 2001/07/27 13:33:25 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.16 2001/07/27 14:31:44 jlam Exp $ # # This Makefile fragment is included by packages that use readline(). # @@ -47,21 +47,25 @@ BUILDLINK_FILES.readline= include/readline.h BUILDLINK_FILES.readline+= lib/libedit.* BUILDLINK_TRANSFORM.readline= -e "s|/readline.h|/readline/readline.h|g" BUILDLINK_TRANSFORM.readline+= -e "s|libedit|libreadline|g" +REPLACE_LIBNAMES_SED+= -e "s|-lreadline|-ledit|g" BUILDLINK_PREFIX.history= /usr BUILDLINK_FILES.history= include/history.h BUILDLINK_FILES.history+= lib/libedit.* BUILDLINK_TRANSFORM.history= -e "s|/history.h|/readline/history.h|g" BUILDLINK_TRANSFORM.history+= -e "s|libedit|libhistory|g" +REPLACE_LIBNAMES_SED+= -e "s|-lhistory|-ledit|g" .else # exists(/usr/include/readline/readline.h) BUILDLINK_PREFIX.readline= /usr BUILDLINK_FILES.readline= include/readline/* BUILDLINK_FILES.readline+= lib/libedit.* BUILDLINK_TRANSFORM.readline= -e "s|libedit|libreadline|g" +REPLACE_LIBNAMES_SED+= -e "s|-lreadline|-ledit|g" BUILDLINK_PREFIX.history= /usr BUILDLINK_FILES.history+= lib/libedit.* BUILDLINK_TRANSFORM.history= -e "s|libedit|libhistory|g" +REPLACE_LIBNAMES_SED+= -e "s|-lhistory|-ledit|g" .endif .endif -- cgit v1.2.3