From df7352062c94b0a79015fcd34be720e0ae9799e7 Mon Sep 17 00:00:00 2001 From: jmc Date: Wed, 6 Aug 2003 16:55:10 +0000 Subject: Chicken and egg problem. Need buildlink2 support for building the shell so it can fix -lreadline to -ledit if needed. But..this is referencing -L/usr/pkg/lib/... in it's link for -lrs which then gets transformed and library not found. Fix by copying librs.a into buildlink's lib dir after setting up install-base. Also pass MAKE_ENV along to the shell make to then fix readline vs edit. --- lang/RScheme/Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'lang/RScheme') diff --git a/lang/RScheme/Makefile b/lang/RScheme/Makefile index d88e79d2543..4e067cf379e 100644 --- a/lang/RScheme/Makefile +++ b/lang/RScheme/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2003/08/04 15:34:18 jtb Exp $ +# $NetBSD: Makefile,v 1.13 2003/08/06 16:55:10 jmc Exp $ DISTNAME= rs-0.7.3.2 PKGNAME= RScheme-0.7.3.2 @@ -52,8 +52,11 @@ do-build: @cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE} ${ALL_TARGET} do-install: - @cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE} install-base && ${MAKE} shell && \ - ${MAKE} install-shell && ${MAKE} packages + @cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE} install-base && \ + ${CP} install/lib/librs.a ${BUILDLINK_DIR}/lib && \ + ${SETENV} ${MAKE_ENV} ${MAKE} shell && \ + ${MAKE} install-shell && \ + ${MAKE} packages post-install: ${LN} -fs ${PREFIX}/lib/rscheme/bin/rs ${PREFIX}/bin/rscheme -- cgit v1.2.3