knu	2008-06-15 19:28:47 +0900 (Sun, 15 Jun 2008)

  New Revision: 17183

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/configure.in
    branches/ruby_1_8_7/version.h

  Log:
    * configure.in: Fix $LOAD_PATH.  Properly expand vendor_ruby
      directories; submitted by Takahiro Kambe <taca at
      back-street.net> in [ruby-dev:35099].


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/configure.in?r1=17183&r2=17182&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/ChangeLog?r1=17183&r2=17182&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/version.h?r1=17183&r2=17182&diff_format=u

Index: ruby_1_8_7/configure.in
===================================================================
--- ruby_1_8_7/configure.in	(revision 17182)
+++ ruby_1_8_7/configure.in	(revision 17183)
@@ -1717,14 +1717,14 @@
 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}")
 
Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 17182)
+++ ruby_1_8_7/ChangeLog	(revision 17183)
@@ -1,3 +1,9 @@
+Sun Jun 15 19:27:40 2008  Akinori MUSHA  <knu@i...>
+
+	* 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@i...>
 
 	* lib/set.rb (Set#delete_if): Call to_a.
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 17182)
+++ ruby_1_8_7/version.h	(revision 17183)
@@ -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[];

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/