diff options
| author | taca <taca@pkgsrc.org> | 2005-09-11 15:54:22 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2005-09-11 15:54:22 +0000 |
| commit | 9586475c4498ff765d3ef0a51191d71f015b0c23 (patch) | |
| tree | 0b61b829e14557ca113028f3268b50a9f23880bc /lang | |
| parent | 07f1bb304a8ca2ff45dc57bc5f1e896bf28f29cc (diff) | |
| download | pkgsrc-9586475c4498ff765d3ef0a51191d71f015b0c23.tar.gz | |
Move default definition of DIST_SUBDIR for Ruby related
from modules.mk to rubyversion.mk.
This should fix devel/ruby-rd-mode package.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/ruby/modules.mk | 9 | ||||
| -rw-r--r-- | lang/ruby/rubyversion.mk | 9 |
2 files changed, 9 insertions, 9 deletions
diff --git a/lang/ruby/modules.mk b/lang/ruby/modules.mk index 099a1fb7719..ddbf8ebf795 100644 --- a/lang/ruby/modules.mk +++ b/lang/ruby/modules.mk @@ -1,4 +1,4 @@ -# $NetBSD: modules.mk,v 1.9 2005/06/23 15:16:53 minskim Exp $ +# $NetBSD: modules.mk,v 1.10 2005/09/11 15:54:22 taca Exp $ .if !defined(_RUBY_MODULE_MK) _RUBY_MODULE_MK= # defined @@ -14,13 +14,6 @@ DEPENDS+= ruby${RUBY_VER}-base>=${RUBY_REQD}:../../lang/ruby${RUBY_VER}-base CONFIGURE_ENV+= RUBY=${RUBY} RDOC=${RDOC} # -# make ruby module package to common DIST_SUBDIR -# -.if defined(RUBY_DIST_SUBDIR) && !empty(RUBY_DIST_SUBDIR) -DIST_SUBDIR?= ${RUBY_DIST_SUBDIR} -.endif - -# # extconf.rb support # # RUBY_EXTCONF specify extconf script name (default: extconf.rb). diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk index 62c14c70fe0..73b181048ef 100644 --- a/lang/ruby/rubyversion.mk +++ b/lang/ruby/rubyversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: rubyversion.mk,v 1.12 2005/08/31 08:50:32 jlam Exp $ +# $NetBSD: rubyversion.mk,v 1.13 2005/09/11 15:54:22 taca Exp $ # .ifndef _RUBYVERSION_MK @@ -188,6 +188,13 @@ RUBY_EXAMPLESDIR?= ${LOCALBASE}/share/examples/${RUBY_NAME} RUBY_DIST_SUBDIR?= ruby # +# make ruby reletaed package to common DIST_SUBDIR +# +.if !empty(RUBY_DIST_SUBDIR) +DIST_SUBDIR?= ${RUBY_DIST_SUBDIR} +.endif + +# # MAKE_ENV # MAKEFLAGS+= RUBY_VER="${RUBY_VER}" \ |