From bc2e21dde75bb7931793f0d48fee97067689897f Mon Sep 17 00:00:00 2001 From: mishka Date: Thu, 2 Aug 2012 14:35:01 +0000 Subject: The R build/install process should seize all relevant environment variables, and customization should be done via INSTALL_ENV/MAKE_ENV respectively. This also solves the internationalization issue fixed in previous commit properly. Noted by on pkgsrc-changes@, many thanks! --- math/R/Makefile.extension | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'math') diff --git a/math/R/Makefile.extension b/math/R/Makefile.extension index 963d6593409..4ab367b3410 100644 --- a/math/R/Makefile.extension +++ b/math/R/Makefile.extension @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.extension,v 1.15 2012/07/24 21:26:27 mishka Exp $ +# $NetBSD: Makefile.extension,v 1.16 2012/08/02 14:35:01 mishka Exp $ # # This Makefile fragment is included by packages for R library packages. # @@ -21,10 +21,13 @@ WRKSRC= ${WRKDIR}/${R_PKGNAME} INSTALLATION_DIRS= ${R_LIB} +INSTALL_ENV+= R_LIBS= + do-build: do-install: - LC_ALL=C R_LIBS= ${LOCALBASE}/bin/R CMD INSTALL ${R_PKG_INSTALL_ARGS} ${WRKDIR}/${R_PKGNAME} + ${PKGSRC_SETENV} ${INSTALL_ENV} ${MAKE_ENV} ${LOCALBASE}/bin/R \ + CMD INSTALL ${R_PKG_INSTALL_ARGS} ${WRKDIR}/${R_PKGNAME} R_LIB= lib/R/library R_INST_DIRS?= ${R_PKGNAME} -- cgit v1.2.3