diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 21 |
2 files changed, 13 insertions, 12 deletions
@@ -1,3 +1,7 @@ +Fri Mar 14 16:59:23 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (RUBY_LIB_PREFIX): fix for prefix. + Fri Mar 14 16:35:11 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * lib/cgi.rb (CGI::Cookie::initialize): performance patch from diff --git a/configure.in b/configure.in index d0fbb2f25e..342cca90eb 100644 --- a/configure.in +++ b/configure.in @@ -1618,28 +1618,25 @@ case "$target_os" in rubyw_install_name="$RUBYW_INSTALL_NAME" ;; esac -case "$target_os" in - cygwin*|mingw*|*djgpp*|os2-emx*) - RUBY_LIB_PREFIX="`expr "$libdir" : "$prefix\(/.*\)"`/ruby" - ;; - *) - RUBY_LIB_PREFIX="${libdir}/ruby" - ;; -esac -RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}" +RUBY_LIB_PREFIX=`eval echo \\"${libdir}/ruby\\"` AC_ARG_WITH(sitedir, [ --with-sitedir=DIR site libraries in DIR [PREFIX/lib/ruby/site_ruby]], [sitedir=$withval], [sitedir='${libdir}/ruby/site_ruby']) SITE_DIR=`eval echo \\"${sitedir}\\"` + case "$target_os" in cygwin*|mingw*|*djgpp*|os2-emx*) - RUBY_SITE_LIB_PATH="`expr "$SITE_DIR" : "$prefix\(/.*\)"`" || - RUBY_SITE_LIB_PATH="$SITE_DIR";; + RUBY_LIB_PREFIX="`eval echo "$RUBY_LIB_PREFIX" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`" + RUBY_SITE_LIB_PATH="`eval echo "$SITE_DIR" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`" + ;; *) - RUBY_SITE_LIB_PATH="$SITE_DIR";; + RUBY_LIB_PREFIX="`eval echo \\"$RUBY_LIB_PREFIX\\" | sed 's|^NONE/|'"$prefix"'/|'`" + RUBY_SITE_LIB_PATH="`eval echo \\"$SITE_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`" + ;; esac +RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}" RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${MAJOR}.${MINOR}" AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}") |