From 9ec903b6c89ffe7bbb4ddf1c2b5d22965d6adf9c Mon Sep 17 00:00:00 2001 From: knu Date: Sun, 8 Jun 2008 18:23:46 +0000 Subject: * configure.in (VENDOR_DIR): use LIBDIR instead of PREFIX as well as SITE_DIR. a patch from Richard Brown in [ruby-core:17129]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@17030 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ configure.in | 6 +++--- version.h | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5529e43c88..15c0ec1594 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Jun 9 03:22:43 2008 Nobuyoshi Nakada + + * configure.in (VENDOR_DIR): use LIBDIR instead of PREFIX as well as + SITE_DIR. a patch from Richard Brown in + [ruby-core:17129]. + Mon Jun 9 03:21:20 2008 Tanaka Akira * gc.c (os_obj_of): assure to not free the scanning heap. diff --git a/configure.in b/configure.in index d5e5be9e86..afcee67aa0 100644 --- a/configure.in +++ b/configure.in @@ -1688,7 +1688,7 @@ esac RUBY_LIB_PREFIX=`eval echo \\"${libdir}/ruby\\"` AC_ARG_WITH(sitedir, - [ --with-sitedir=DIR site libraries in DIR [PREFIX/lib/ruby/site_ruby]], + [ --with-sitedir=DIR site libraries in DIR [[LIBDIR/ruby/site_ruby]]], [sitedir=$withval], [sitedir='${libdir}/ruby/site_ruby']) SITE_DIR=`eval echo \\"${sitedir}\\"` @@ -1711,9 +1711,9 @@ AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}") AC_DEFINE_UNQUOTED(RUBY_SITE_LIB2, "${RUBY_SITE_LIB_PATH2}") AC_ARG_WITH(vendordir, - [ --with-vendordir=DIR vendor libraries in DIR [PREFIX/lib/ruby/vendor_ruby]], + [ --with-vendordir=DIR vendor libraries in DIR [[LIBDIR/ruby/vendor_ruby]]], [vendordir=$withval], - [vendordir='${prefix}/lib/ruby/vendor_ruby']) + [vendordir='${libdir}/ruby/vendor_ruby']) VENDOR_DIR=`eval echo \\"${vendordir}\\"` case "$target_os" in cygwin*|mingw*|*djgpp*|os2-emx*) diff --git a/version.h b/version.h index 3fdd32703e..1074af61c1 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-09" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20080609 -#define RUBY_PATCHLEVEL 12 +#define RUBY_PATCHLEVEL 13 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3