diff options
author | mishka <mishka> | 2012-08-02 14:35:01 +0000 |
---|---|---|
committer | mishka <mishka> | 2012-08-02 14:35:01 +0000 |
commit | a33af7f1625ed6e7d249419b4f3f612193ee21b7 (patch) | |
tree | 794036c58b6cd91f7e9d63c389ade1716958498c | |
parent | 4ece09ed7755ae5204ae2704cb4eabce660a4939 (diff) | |
download | pkgsrc-a33af7f1625ed6e7d249419b4f3f612193ee21b7.tar.gz |
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 <joerg> on pkgsrc-changes@, many thanks!
-rw-r--r-- | math/R/Makefile.extension | 7 |
1 files changed, 5 insertions, 2 deletions
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} |