diff options
| author | knu <knu@FreeBSD.org> | 2001-10-08 14:39:54 +0800 |
|---|---|---|
| committer | knu <knu@FreeBSD.org> | 2001-10-08 14:39:54 +0800 |
| commit | fecf173df138658828a6b7b1c87f1eddf0bf4e09 (patch) | |
| tree | 0ef3faa4310ed74782f43ee80085cc233ce93d59 /Mk/bsd.ruby.mk | |
| parent | 0520ddd8cc69d8396e305983c8d4e10ee102fc61 (diff) | |
| download | freebsd-ports-gnome-fecf173df138658828a6b7b1c87f1eddf0bf4e09.tar.gz freebsd-ports-gnome-fecf173df138658828a6b7b1c87f1eddf0bf4e09.tar.zst freebsd-ports-gnome-fecf173df138658828a6b7b1c87f1eddf0bf4e09.zip | |
Properly support the case where a user sets RUBY_DEFAULT_VER=1.7.
Reported by: roberto
Diffstat (limited to 'Mk/bsd.ruby.mk')
| -rw-r--r-- | Mk/bsd.ruby.mk | 8 |
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} |