diff options
| -rw-r--r-- | lang/ruby/rubyversion.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk index fe6dc8a6215..079a996e328 100644 --- a/lang/ruby/rubyversion.mk +++ b/lang/ruby/rubyversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: rubyversion.mk,v 1.108 2014/02/02 07:46:16 taca Exp $ +# $NetBSD: rubyversion.mk,v 1.109 2014/02/04 03:16:44 taca Exp $ # # This file determines which Ruby version is used as a dependency for @@ -200,8 +200,10 @@ _RUBYVERSION_MK= # defined .include "../../mk/bsd.prefs.mk" -.if defined(PKGNAME_REQD) && (!empty(PKGNAME_REQD:Mruby[0-9][0-9][0-9]-*) || !empty(PKGNAME_REQD:Mruby[0-9][0-9]-*)) +.if defined(PKGNAME_REQD) +. if !empty(PKGNAME_REQD:Mruby[0-9][0-9][0-9]-*) || !empty(PKGNAME_REQD:Mruby[0-9][0-9]-*) RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/ruby([0-9][0-9]+)-.*/\1/} +. endif .endif # current supported Ruby's version @@ -226,13 +228,13 @@ RUBY_VERSION_SUPPORTED?= 200 193 18 .if defined(RUBY_VERSION_REQD) . for rv in ${RUBY_VERSION_SUPPORTED} -. if ${rv} == ${RUBY_VERSION_REQD} +. if "${rv}" == ${RUBY_VERSION_REQD} RUBY_VER= ${rv} . endif . endfor .elif !defined(RUBY_VER) . for rv in ${RUBY_VERSION_SUPPORTED} -. if ${rv} == ${RUBY_VERSION_DEFAULT} +. if "${rv}" == ${RUBY_VERSION_DEFAULT} RUBY_VER= ${rv} . endif . endfor |