knu	2008-06-14 22:19:03 +0900 (Sat, 14 Jun 2008)

  New Revision: 17161

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/configure.in

  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/configure.in?r1=17161&r2=17160&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=17161&r2=17160&diff_format=u

Index: ruby_1_8/configure.in
===================================================================
--- ruby_1_8/configure.in	(revision 17160)
+++ ruby_1_8/configure.in	(revision 17161)
@@ -1727,14 +1727,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/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 17160)
+++ ruby_1_8/ChangeLog	(revision 17161)
@@ -1,3 +1,9 @@
+Sat Jun 14 22:16:09 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].
+
 Sat Jun 14 16:55:46 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* file.c (file_expand_path): no need to expand root path which has no

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