diff options
| author | jlam <jlam> | 2008-03-12 03:18:47 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2008-03-12 03:18:47 +0000 |
| commit | e365fc8b54833a70bcb12e295351b5df57ee5031 (patch) | |
| tree | eff564ac663ca8b43dfe40011c1585f9c1f69f70 /lang | |
| parent | 4d93da0908c3c010918db36ee66af3c806fbd781 (diff) | |
| download | pkgsrc-e365fc8b54833a70bcb12e295351b5df57ee5031.tar.gz | |
In the *-install targets, add ${INSTALL_ENV} to the environment passed
to the installation script. This causes DESTDIR to be passed through
if a package has DESTDIR support.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/ruby/modules.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lang/ruby/modules.mk b/lang/ruby/modules.mk index 18cc11cea59..68ea3bb4149 100644 --- a/lang/ruby/modules.mk +++ b/lang/ruby/modules.mk @@ -1,4 +1,4 @@ -# $NetBSD: modules.mk,v 1.21 2008/03/08 00:47:31 jlam Exp $ +# $NetBSD: modules.mk,v 1.22 2008/03/12 03:18:47 jlam Exp $ .if !defined(_RUBY_MODULE_MK) _RUBY_MODULE_MK= # defined @@ -60,7 +60,7 @@ do-install: ruby-extconf-install ruby-extconf-install: .for d in ${RUBY_EXTCONF_SUBDIRS} @${ECHO_MSG} "===> Installing ${d}" - ${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}/${d}; ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET} + ${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}/${d}; ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET} .endfor .endif @@ -113,7 +113,7 @@ _RUBY_SETUP_INSTALLARGS+= --prefix=${DESTDIR:Q} ruby-setup-install: @${ECHO_MSG} "===> Running ${RUBY_SETUP} to ${INSTALL_TARGET}" ${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}; \ - ${SETENV} ${MAKE_ENV} ${RUBY} ${RUBY_SETUP} ${_RUBY_SETUP_INSTALLARGS} + ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} ${RUBY} ${RUBY_SETUP} ${_RUBY_SETUP_INSTALLARGS} .endif # @@ -134,7 +134,7 @@ do-install: ruby-simple-install ruby-simple-install: @${ECHO_MSG} "===> Running ${RUBY_SIMPLE_INSTALL} to ${INSTALL_TARGET}" ${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}; \ - ${SETENV} ${MAKE_ENV} ${RUBY} ${RUBY_SIMPLE_INSTALL} ${INSTALL_TARGET} + ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} ${RUBY} ${RUBY_SIMPLE_INSTALL} ${INSTALL_TARGET} .endif .endif # USE_RUBY_INSTALL |