diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-23 16:07:46 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-23 16:07:46 +0000 |
| commit | 8875ffc4120fd8ef273f1b584803bc83891ff23b (patch) | |
| tree | d4649bd1559d94e2f442abbdf324feaa763bed29 /configure.in | |
| parent | 803c0550439fadc86699fd193d541330f1503890 (diff) | |
* configure.in ($ridir): new configuration. [ruby-core:23520].
c.f. [ruby-core:23519].
(--with-ridir): new configure option.
* tool/instruby.rb (:doc, :rdoc): uses $ridir instead of
a fixed path.
* lib/rdoc/ri/paths.rb: follows $ridir.
* Makefile.in: removes RIDATADIR which is no longer used.
* bcc32/Makefile.sub: generates the 'ridir' entry for RbConfig.
removes RIDATADIR which is no longer used.
* win32/Makefile.sub: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23554 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 71614f975b..f03dbfe309 100644 --- a/configure.in +++ b/configure.in @@ -2292,11 +2292,19 @@ esac rubylibprefix='${libdir}/${RUBY_BASE_NAME}' AC_ARG_WITH(rubylibprefix, - AS_HELP_STRING([--with-rubylibprefix=DIR], [prefix for ruby libraries [[LIBDIR/RUBY_INSTALL_NAME]]]), + AS_HELP_STRING([--with-rubylibprefix=DIR], [prefix for ruby libraries [[LIBDIR/RUBY_BASE_NAME]]]), [rubylibprefix=$withval]) RUBY_LIB_PREFIX=`eval echo \\"${rubylibprefix}\\"` AC_SUBST(rubylibprefix) +RI_BASE_NAME=`echo ${RUBY_BASE_NAME} | sed 's/ruby/ri/'` +ridir='${DATAROOTDIR}/${RI_BASE_NAME}' +AC_ARG_WITH(ridir, + AS_HELP_STRING([--with-ridir=DIR], [ri documentation [[DATAROOTDIR/ri]]]), + [ridir=$withval]) +RIDIR=`eval echo \\"${ridir}\\"` +AC_SUBST(ridir) + AC_ARG_WITH(ruby-version, AS_HELP_STRING([--with-ruby-version=STR], [ruby version string for version specific directories [[full]] (full|minor|STR)]), [ruby_version=$withval], |