diff options
author | knu <knu@FreeBSD.org> | 2002-03-11 04:42:48 +0800 |
---|---|---|
committer | knu <knu@FreeBSD.org> | 2002-03-11 04:42:48 +0800 |
commit | cf085f1a3ddb45ac6fd83687563eb8948220373b (patch) | |
tree | f508a6ecc3af60da4ef1a6db2570e3b2ad352dfb | |
parent | 36137115e9a07343439a0d9e6c21e1c3d42ef154 (diff) | |
download | freebsd-ports-gnome-cf085f1a3ddb45ac6fd83687563eb8948220373b.tar.gz freebsd-ports-gnome-cf085f1a3ddb45ac6fd83687563eb8948220373b.tar.zst freebsd-ports-gnome-cf085f1a3ddb45ac6fd83687563eb8948220373b.zip |
Move some variable definitions outside the .if defined(RUBY) block so
they will not be referenced without being defined.
Submitted by: gad
-rw-r--r-- | Mk/bsd.ruby.mk | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index 1b2cdbaec7cf..d9a09e68158a 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -112,6 +112,15 @@ RUBY_DISTVERSION?= ${RUBY_VERSION} #RUBY_PATCHFILES?= ruby-${RUBY_DISTVERSION}-yyyy.mm.dd.diff.bz2 RUBY_PORTVERSION?= ${RUBY_VERSION} .endif +# defined(RUBY_VER) && ${RUBY_VER} == 1.7 + +RUBY_ARCH?= ${ARCH}-freebsd${OSREL:C/\..*//}${RUBY_R} +RUBY_NAME?= ruby${RUBY_SUFFIX} + +_RUBY_SYSLIBDIR?= ${LOCALBASE}/lib +_RUBY_SITEDIR?= ${_RUBY_SYSLIBDIR}/ruby/site_ruby +.endif +# defined(RUBY) RUBY_DEFAULT_VER?= 1.6 RUBY_DEFAULT_SUFFIX?= ${RUBY_DEFAULT_VER:S/.//} @@ -122,13 +131,6 @@ RUBY_DISTNAME?= ruby-${RUBY_DISTVERSION} RUBY_WRKSRC?= ${WRKDIR}/${RUBY_DISTNAME} -RUBY_ARCH?= ${ARCH}-freebsd${OSREL:C/\..*//}${RUBY_R} -RUBY_NAME?= ruby${RUBY_SUFFIX} - -_RUBY_SYSLIBDIR?= ${LOCALBASE}/lib -_RUBY_SITEDIR?= ${_RUBY_SYSLIBDIR}/ruby/site_ruby -.endif - RUBY_VERSION_CODE?= ${RUBY_VERSION:S/.//g} RUBY_VER= ${RUBY_VERSION:R} _RUBY_SUFFIX= ${RUBY_VER:S/.//}${RUBY_R} |