[pkgsrc/trunk]: pkgsrc/lang/ruby Move default definition of DIST_SUBDIR for R...

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2ce4d0055565
branches:  trunk
changeset: 499152:2ce4d0055565
user:      taca <taca%pkgsrc.org@localhost>
date:      Sun Sep 11 15:54:22 2005 +0000

description:
Move default definition of DIST_SUBDIR for Ruby related
from modules.mk to rubyversion.mk.

This should fix devel/ruby-rd-mode package.

diffstat:

 lang/ruby/modules.mk     |  9 +--------
 lang/ruby/rubyversion.mk |  9 ++++++++-
 2 files changed, 9 insertions(+), 9 deletions(-)

diffs (46 lines):

diff -r 0f364ab5327a -r 2ce4d0055565 lang/ruby/modules.mk
--- a/lang/ruby/modules.mk      Sun Sep 11 15:14:48 2005 +0000
+++ b/lang/ruby/modules.mk      Sun Sep 11 15:54:22 2005 +0000
@@ -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 @@
 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 -r 0f364ab5327a -r 2ce4d0055565 lang/ruby/rubyversion.mk
--- a/lang/ruby/rubyversion.mk  Sun Sep 11 15:14:48 2005 +0000
+++ b/lang/ruby/rubyversion.mk  Sun Sep 11 15:54:22 2005 +0000
@@ -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_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}" \