summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2008-03-18 04:01:27 +0000
committerjlam <jlam@pkgsrc.org>2008-03-18 04:01:27 +0000
commit1ba20e8a930950515c53eeb959eedc9ac63c7a4a (patch)
treeb0791138c10131856a0de6e321dac4eacd4e6185 /misc
parentcc508cadcbffb57194bc43815439d43253b97899 (diff)
downloadpkgsrc-1ba20e8a930950515c53eeb959eedc9ac63c7a4a.tar.gz
Fix subtle interaction with DESTDIR during installation -- the Makefiles
generated by mkmf.rb are actually not DESTDIR-safe because the $(DESTDIR) value gets propagated to the rpath. Since we already pass --buildroot to deal with staged installations, explicitly strip out DESTDIR from the environment.
Diffstat (limited to 'misc')
-rw-r--r--misc/rubygems/rubygem.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/misc/rubygems/rubygem.mk b/misc/rubygems/rubygem.mk
index 9907206d7df..48d6a78ed31 100644
--- a/misc/rubygems/rubygem.mk
+++ b/misc/rubygems/rubygem.mk
@@ -1,4 +1,4 @@
-# $NetBSD: rubygem.mk,v 1.23 2008/03/18 03:50:35 jlam Exp $
+# $NetBSD: rubygem.mk,v 1.24 2008/03/18 04:01:27 jlam Exp $
#
# This Makefile fragment is intended to be included by packages that build
# and install Ruby gems.
@@ -219,7 +219,7 @@ gem-install: ${_GEM_INSTALL_TARGETS}
_gem-install-buildroot:
@${STEP_MSG} "Installing gem into buildroot"
- ${RUN} ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} \
+ ${RUN} ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} DESTDIR= \
${RUBYGEM} install ${_RUBYGEM_OPTIONS}
.if !empty(GEM_CLEANBUILD)