diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | configure.in | 6 |
2 files changed, 7 insertions, 3 deletions
@@ -1,3 +1,7 @@ +Fri Mar 14 15:49:05 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (RUBY_LIB_PREFIX): use libdir. + Fri Mar 14 10:12:29 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * configure.in (RUBY_CHECK_VARTYPE): should not indent preprocessor diff --git a/configure.in b/configure.in index 3533a41dd8..d0fbb2f25e 100644 --- a/configure.in +++ b/configure.in @@ -1620,10 +1620,10 @@ case "$target_os" in esac case "$target_os" in cygwin*|mingw*|*djgpp*|os2-emx*) - RUBY_LIB_PREFIX="/lib/ruby" + RUBY_LIB_PREFIX="`expr "$libdir" : "$prefix\(/.*\)"`/ruby" ;; *) - RUBY_LIB_PREFIX="${prefix}/lib/ruby" + RUBY_LIB_PREFIX="${libdir}/ruby" ;; esac RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}" @@ -1631,7 +1631,7 @@ RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}" AC_ARG_WITH(sitedir, [ --with-sitedir=DIR site libraries in DIR [PREFIX/lib/ruby/site_ruby]], [sitedir=$withval], - [sitedir='${prefix}/lib/ruby/site_ruby']) + [sitedir='${libdir}/ruby/site_ruby']) SITE_DIR=`eval echo \\"${sitedir}\\"` case "$target_os" in cygwin*|mingw*|*djgpp*|os2-emx*) |