From 85aae4c658cd515a02fcc646fa1d1d67aed2c2c6 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 6 Feb 2013 08:32:43 +0000 Subject: configure.in: architecture name * configure.in, version.c: parametric architecture name for paths. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39105 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- configure.in | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 0b369bea04..cff998d53d 100644 --- a/configure.in +++ b/configure.in @@ -3143,8 +3143,8 @@ shvar_to_cpp() { -e 's/\${\([[A-Z][A-Z_]]*\)}/"\1"/g' \ -e 's|\${libdir}|'"${libdir}|g" \ -e 's/\${ruby_version}/"RUBY_LIB_VERSION"/g' \ - -e 's/\${arch}/"RUBY_ARCH"/g' \ - -e 's/\${sitearch}/"RUBY_SITEARCH"/g' \ + -e 's/\${arch}/"arch"/g' \ + -e 's/\${sitearch}/"arch"/g' \ -e 's/\${vendorarchdir}/"RUBY_VENDOR_ARCH_LIB"/g' \ -e 's/\${sitearchdir}/"RUBY_SITE_ARCH_LIB"/g' \ -e 's/\${vendorlibdir}/"RUBY_VENDOR_LIB2"/g' \ @@ -3240,17 +3240,23 @@ shvar_to_cpp RUBY_LIB "${rubylibdir}" if test "x${RUBY_LIB}" != 'xRUBY_LIB_PREFIX"/"RUBY_LIB_VERSION'; then AC_DEFINE_UNQUOTED(RUBY_LIB, ${RUBY_LIB} !!) fi +shvar_to_cpp RUBY_ARCH_LIB_FOR "${rubyarchdir}" +AC_DEFINE_UNQUOTED(RUBY_ARCH_LIB_FOR(arch), ${RUBY_ARCH_LIB_FOR} !!) if test "x$sitedir" = xno; then AC_DEFINE(NO_RUBY_SITE_LIB, [] !!) else shvar_to_cpp RUBY_SITE_LIB "${sitedir}" AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, ${RUBY_SITE_LIB} !!) + shvar_to_cpp RUBY_SITE_ARCH_LIB_FOR "${sitearchdir}" + AC_DEFINE_UNQUOTED(RUBY_SITE_ARCH_LIB_FOR(arch), ${RUBY_SITE_ARCH_LIB_FOR} !!) fi if test "x$vendordir" = xno; then AC_DEFINE(NO_RUBY_VENDOR_LIB, [] !!) else shvar_to_cpp RUBY_VENDOR_LIB "${vendordir}" AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB, ${RUBY_VENDOR_LIB} !!) + shvar_to_cpp RUBY_VENDOR_ARCH_LIB_FOR "${vendorarchdir}" + AC_DEFINE_UNQUOTED(RUBY_VENDOR_ARCH_LIB_FOR(arch), ${RUBY_VENDOR_ARCH_LIB_FOR} !!) fi AC_SUBST(arch)dnl -- cgit v1.2.3