aboutsummaryrefslogtreecommitdiff
path: root/Mk
diff options
context:
space:
mode:
authorAkinori MUSHA <knu@FreeBSD.org>2001-10-08 06:39:54 +0000
committerAkinori MUSHA <knu@FreeBSD.org>2001-10-08 06:39:54 +0000
commit6b314a7244cf1ca1e71e95dd04a9a052bb34b01a (patch)
tree0fd37b21aeaf2c708f4778e53f3eacd0d35b63cc /Mk
parenta764b36035e05a48e0c9a806606b77a94b043f3d (diff)
downloadports-6b314a7244cf1ca1e71e95dd04a9a052bb34b01a.tar.gz
ports-6b314a7244cf1ca1e71e95dd04a9a052bb34b01a.zip
Notes
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.ruby.mk8
1 files changed, 6 insertions, 2 deletions
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk
index 276e52605d26..23c2215e87fe 100644
--- a/Mk/bsd.ruby.mk
+++ b/Mk/bsd.ruby.mk
@@ -102,14 +102,12 @@ RUBY?= ${LOCALBASE}/bin/${RUBY_NAME}
.if defined(RUBY_VER) && ${RUBY_VER} == 1.7
RUBY_VERSION?= 1.7.1
-RUBY_SUFFIX?= ${_RUBY_SUFFIX}
RUBY_PORT?= lang/ruby${RUBY_R}-devel
RUBY_DISTVERSION?= ${RUBY_VERSION:R}-2001.09.01
RUBY_DISTPATCHVERSION?= ${RUBY_DISTVERSION}-2001.10.05
RUBY_PORTVERSION?= ${RUBY_VERSION}.2001.10.05
.else
RUBY_VERSION?= 1.6.5
-RUBY_SUFFIX?= ${RUBY_R}
RUBY_DISTVERSION?= ${RUBY_VERSION}
RUBY_DISTPATCHVERSION?= ${RUBY_DISTVERSION}-2001.10.05
RUBY_PORTVERSION?= ${RUBY_VERSION}.2001.10.05
@@ -138,6 +136,12 @@ RUBY_VERSION_CODE?= ${RUBY_VERSION:S/.//g}
RUBY_VER= ${RUBY_VERSION:R}
_RUBY_SUFFIX= ${RUBY_VER:S/.//}${RUBY_R}
+.if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
+RUBY_SUFFIX?= ${RUBY_R}
+.else
+RUBY_SUFFIX?= ${_RUBY_SUFFIX}
+.endif
+
RUBY_WITHOUT_SUFFIX?= ${LOCALBASE}/bin/ruby
RUBY_WITH_SUFFIX?= ${RUBY_WITHOUT_SUFFIX}${_RUBY_SUFFIX}