diff options
author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 10:28:47 +0000 |
---|---|---|
committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 10:28:47 +0000 |
commit | 54f5ab713001fe2b12c32d629b37147066d1f7b3 (patch) | |
tree | 5fd9cff9924f0658993423af26d66fc83ce7e840 | |
parent | 9dd3f0822bc336e572a511f1297b5061828b9a4f (diff) |
* configure.in: Fix $LOAD_PATH. Properly expand vendor_ruby
directories; submitted by Takahiro Kambe <taca at
back-street.net> in [ruby-dev:35099].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@17183 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | configure.in | 8 | ||||
-rw-r--r-- | version.h | 8 |
3 files changed, 14 insertions, 8 deletions
@@ -1,3 +1,9 @@ +Sun Jun 15 19:27:40 2008 Akinori MUSHA <knu@iDaemons.org> + + * configure.in: Fix $LOAD_PATH. Properly expand vendor_ruby + directories; submitted by Takahiro Kambe <taca at + back-street.net> in [ruby-dev:35099]. + Mon Jun 9 17:56:30 2008 Akinori MUSHA <knu@iDaemons.org> * lib/set.rb (Set#delete_if): Call to_a. diff --git a/configure.in b/configure.in index afcee67aa0..2a849cb979 100644 --- a/configure.in +++ b/configure.in @@ -1717,14 +1717,14 @@ AC_ARG_WITH(vendordir, VENDOR_DIR=`eval echo \\"${vendordir}\\"` case "$target_os" in cygwin*|mingw*|*djgpp*|os2-emx*) - RUBY_VENDOR_LIB_PATH="`expr "$VENDOR_DIR" : "$prefix\(/.*\)"`" || - RUBY_VENDOR_LIB_PATH="$VENDOR_DIR";; + RUBY_VENDOR_LIB_PATH="`eval echo "$VENDOR_DIR" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`" + ;; *) - RUBY_VENDOR_LIB_PATH="$VENDOR_DIR";; + RUBY_VENDOR_LIB_PATH="`eval echo \\"$VENDOR_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`" + ;; esac RUBY_VENDOR_LIB_PATH2="${RUBY_VENDOR_LIB_PATH}/${MAJOR}.${MINOR}" -AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}") AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB, "${RUBY_VENDOR_LIB_PATH}") AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB2, "${RUBY_VENDOR_LIB_PATH2}") @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2008-06-09" +#define RUBY_RELEASE_DATE "2008-06-15" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20080609 -#define RUBY_PATCHLEVEL 17 +#define RUBY_RELEASE_CODE 20080615 +#define RUBY_PATCHLEVEL 18 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 7 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 6 -#define RUBY_RELEASE_DAY 9 +#define RUBY_RELEASE_DAY 15 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |