Move default definition of DIST_SUBDIR for Ruby related
from modules.mk to rubyversion.mk. This should fix devel/ruby-rd-mode package.
This commit is contained in:
parent
07f1bb304a
commit
9586475c44
2 changed files with 9 additions and 9 deletions
|
@ -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
|
||||
|
@ -13,13 +13,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
|
||||
#
|
||||
|
|
|
@ -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
|
||||
|
@ -187,6 +187,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
|
||||
#
|
||||
|
|
Loading…
Reference in a new issue