Sat Mar 8 00:47:31 2008 UTC ()
Back out previous... this was a mistake because the setup.rb file I
was looking at was not the "standard" setup.rb file.  In standard
setup.rb files, the argument to --prefix is indeed the staging directory.


(jlam)
diff -r1.20 -r1.21 pkgsrc/lang/ruby/modules.mk
cvs diff -r1.20 -r1.21 pkgsrc/lang/ruby/modules.mk (expand / switch to unified diff)

--- pkgsrc/lang/ruby/modules.mk 2008/03/07 22:41:32 1.20
+++ pkgsrc/lang/ruby/modules.mk 2008/03/08 00:47:31 1.21
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: modules.mk,v 1.20 2008/03/07 22:41:32 jlam Exp $ 1# $NetBSD: modules.mk,v 1.21 2008/03/08 00:47:31 jlam Exp $
2 2
3.if !defined(_RUBY_MODULE_MK) 3.if !defined(_RUBY_MODULE_MK)
4_RUBY_MODULE_MK= # defined 4_RUBY_MODULE_MK= # defined
5 5
6.include "../../lang/ruby/rubyversion.mk" 6.include "../../lang/ruby/rubyversion.mk"
7 7
8.if defined(NO_BUILD) && empty(NO_BUILD:M[Nn][Oo]) 8.if defined(NO_BUILD) && empty(NO_BUILD:M[Nn][Oo])
9DEPENDS+= ruby${RUBY_VER}-base>=${RUBY_REQD}:../../lang/ruby${RUBY_VER}-base 9DEPENDS+= ruby${RUBY_VER}-base>=${RUBY_REQD}:../../lang/ruby${RUBY_VER}-base
10.else 10.else
11.include "../../lang/ruby/buildlink3.mk" 11.include "../../lang/ruby/buildlink3.mk"
12.endif 12.endif
13 13
14CONFIGURE_ENV+= RUBY=${RUBY:Q} RDOC=${RDOC:Q} 14CONFIGURE_ENV+= RUBY=${RUBY:Q} RDOC=${RDOC:Q}
@@ -97,27 +97,27 @@ ruby-setup-configure: @@ -97,27 +97,27 @@ ruby-setup-configure:
97do-build: ruby-setup-build 97do-build: ruby-setup-build
98 98
99ruby-setup-build: 99ruby-setup-build:
100 @${ECHO_MSG} "===> Running ${RUBY_SETUP} to build" 100 @${ECHO_MSG} "===> Running ${RUBY_SETUP} to build"
101 ${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}; \ 101 ${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}; \
102 ${SETENV} ${MAKE_ENV} ${RUBY} ${RUBY_SETUP} setup 102 ${SETENV} ${MAKE_ENV} ${RUBY} ${RUBY_SETUP} setup
103.endif 103.endif
104 104
105.if !target(do-install) 105.if !target(do-install)
106do-install: ruby-setup-install 106do-install: ruby-setup-install
107 107
108_RUBY_SETUP_INSTALLARGS= ${INSTALL_TARGET} 108_RUBY_SETUP_INSTALLARGS= ${INSTALL_TARGET}
109.if ${_USE_DESTDIR} != "no" 109.if ${_USE_DESTDIR} != "no"
110_RUBY_SETUP_INSTALLARGS+= --prefix=${DESTDIR:Q}${PREFIX:Q} 110_RUBY_SETUP_INSTALLARGS+= --prefix=${DESTDIR:Q}
111.endif 111.endif
112 112
113ruby-setup-install: 113ruby-setup-install:
114 @${ECHO_MSG} "===> Running ${RUBY_SETUP} to ${INSTALL_TARGET}" 114 @${ECHO_MSG} "===> Running ${RUBY_SETUP} to ${INSTALL_TARGET}"
115 ${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}; \ 115 ${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}; \
116 ${SETENV} ${MAKE_ENV} ${RUBY} ${RUBY_SETUP} ${_RUBY_SETUP_INSTALLARGS} 116 ${SETENV} ${MAKE_ENV} ${RUBY} ${RUBY_SETUP} ${_RUBY_SETUP_INSTALLARGS}
117.endif 117.endif
118 118
119# 119#
120# install.rb support 120# install.rb support
121# 121#
122# USE_RUBY_INSTALL use simple install.rb script to install 122# USE_RUBY_INSTALL use simple install.rb script to install
123# (default: undefined) 123# (default: undefined)