summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.ruby.mk15
1 files changed, 7 insertions, 8 deletions
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk
index 3dc686a3ec75..e58ca1f82e7c 100644
--- a/Mk/bsd.ruby.mk
+++ b/Mk/bsd.ruby.mk
@@ -96,9 +96,13 @@ Ruby_Include_MAINTAINER= knu@FreeBSD.org
# RUBY_ELISPDIR - Installation path for emacs lisp files.
#
-#.if ${ARCH} == alpha || ${ARCH} == sparc64
-#RUBY_VER?= 1.8
-#.endif
+.if ${ARCH} == alpha || ${ARCH} == sparc64 || ${ARCH} == ia64
+RUBY_DEFAULT_VER?= 1.8
+.else
+RUBY_DEFAULT_VER?= 1.6
+.endif
+
+RUBY_VER?= ${RUBY_DEFAULT_VER}
.if defined(RUBY)
.if !exists(${RUBY})
@@ -151,11 +155,6 @@ _RUBY_SITEDIR?= ${_RUBY_SYSLIBDIR}/ruby/site_ruby
.endif
# defined(RUBY)
-#.if ${ARCH} == alpha || ${ARCH} == sparc64
-#RUBY_DEFAULT_VER?= 1.8
-#.else
-RUBY_DEFAULT_VER?= 1.6
-#.endif
RUBY_DEFAULT_SUFFIX?= ${RUBY_DEFAULT_VER:S/.//}
RUBY_DISTVERSION?= ${RUBY_VERSION}