diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-24 14:05:49 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-24 14:05:49 +0000 |
| commit | 5660e09f08362a4146b285ca50225348d1213633 (patch) | |
| tree | 8da9c91dde792b2d70195ec69ab5018e9cc2fc96 /configure.in | |
| parent | f7d4df50c004d775a296b8989bb3ac792db6e639 (diff) | |
* configure.in (sitedir): considers --program-prefix and
--program-suffix.
(vendordir): ditto.
(rubyhdrdir): ditto.
* mkconfig.rb (CONFIG["rubylibdir"]): ditto.
* win32/Makefile.sub: ditto.
* instruby.rb (:rdoc): ditto.
* lib/rdoc/ri/paths.rb (RDoc::RI::Paths): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19923 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 10a0d31003..c9958ee489 100644 --- a/configure.in +++ b/configure.in @@ -1963,7 +1963,7 @@ case "$target_os" in rubyw_install_name="$RUBYW_INSTALL_NAME" ;; esac -RUBY_LIB_PREFIX=`eval echo \\"${libdir}/ruby\\"` +RUBY_LIB_PREFIX=`eval echo \\"${libdir}/${RUBY_INSTALL_NAME}\\"` AC_ARG_WITH(ruby-version, [ --with-ruby-version=STR ruby version string for version specific directories [[full]] (full|minor|STR)], @@ -1981,13 +1981,13 @@ esac AC_ARG_WITH(sitedir, [ --with-sitedir=DIR site libraries in DIR [[LIBDIR/ruby/site_ruby]]], [sitedir=$withval], - [sitedir='${libdir}/ruby/site_ruby']) + [sitedir='${libdir}/${RUBY_INSTALL_NAME}/site_ruby']) SITE_DIR=`eval echo \\"${sitedir}\\"` AC_ARG_WITH(vendordir, [ --with-vendordir=DIR vendor libraries in DIR [[LIBDIR/ruby/vendor_ruby]]], [vendordir=$withval], - [vendordir='${libdir}/ruby/vendor_ruby']) + [vendordir='${libdir}/${RUBY_INSTALL_NAME}/vendor_ruby']) VENDOR_DIR=`eval echo \\"${vendordir}\\"` case "$target_os" in @@ -2056,7 +2056,7 @@ fi AC_ARG_WITH(rubyhdrdir, [ --with-ruby-hdrdir=DIR core headers in DIR [INCLUDEDIR]], [rubyhdrdir=$withval], - [rubyhdrdir='${includedir}/ruby-${ruby_version}']) + [rubyhdrdir='${includedir}/${RUBY_INSTALL_NAME}-${ruby_version}']) AC_ARG_WITH(sitehdrdir, [ --with-site-hdrdir=DIR core headers in DIR [INCLUDEDIR]], |