From 00b95a57779b9fd19bfee66795c0a72fb6faa420 Mon Sep 17 00:00:00 2001 From: jlam Date: Wed, 30 May 2001 05:02:51 +0000 Subject: Use buildlink.mk files to get dependency on readline and prevent unintended linking against installed libraries or finding installed headers except for those that are explicitly linked into ${BUILDLINK_INCDIR} and ${BUILDLINK_LIBDIR}. --- misc/py-readline/Makefile | 13 ++++++++++--- misc/py-readline/files/Setup.in | 6 +++--- 2 files changed, 13 insertions(+), 6 deletions(-) (limited to 'misc') diff --git a/misc/py-readline/Makefile b/misc/py-readline/Makefile index a94c3e1bb75..26e9fa11308 100644 --- a/misc/py-readline/Makefile +++ b/misc/py-readline/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/02/17 18:09:20 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2001/05/30 05:02:51 jlam Exp $ # DISTNAME= ${PY_DISTNAME} @@ -11,10 +11,17 @@ MAINTAINER= tsarna@netbsd.org HOMEPAGE= http://www.python.org/doc/tut/interacting.html COMMENT= line editing support for Python -DEPENDS+= readline>=4.0:../../devel/readline - EXTRACT_ELEMENTS= ${PY_MODULES}/readline.c +USE_GNU_READLINE= # defined + +.include "../../devel/readline/buildlink.mk" + +PY_SETUP_SUBST+= BUILDLINK_INCDIR=${BUILDLINK_INCDIR} +PY_SETUP_SUBST+= BUILDLINK_LIBDIR=${BUILDLINK_LIBDIR} + +pre-configure: ${BUILDLINK_TARGETS} + do-configure: python-std-do-configure do-install: diff --git a/misc/py-readline/files/Setup.in b/misc/py-readline/files/Setup.in index 5a49d25f028..15ec3f86459 100644 --- a/misc/py-readline/files/Setup.in +++ b/misc/py-readline/files/Setup.in @@ -1,5 +1,5 @@ -# $NetBSD: Setup.in,v 1.3 1999/04/23 17:33:28 tsarna Exp $ +# $NetBSD: Setup.in,v 1.4 2001/05/30 05:02:52 jlam Exp $ # *shared* -readline readline.c -L@LOCALBASE@/lib -R@LOCALBASE@/lib \ - -I@LOCALBASE@/include -lreadline -ltermcap +readline readline.c -L@BUILDLINK_LIBDIR@ -R@LOCALBASE@/lib \ + -I@BUILDLINK_INCDIR@ -lreadline -ltermcap -- cgit v1.2.3