nobu	2008-03-14 15:49:08 +0900 (Fri, 14 Mar 2008)

  New Revision: 15777

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

  Log:
    * configure.in (RUBY_LIB_PREFIX): use libdir.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/configure.in?r1=15777&r2=15776&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=15777&r2=15776&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15777&r2=15776&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/configure.in?r1=15777&r2=15776&diff_format=u

Index: configure.in
===================================================================
--- configure.in	(revision 15776)
+++ configure.in	(revision 15777)
@@ -1716,10 +1716,10 @@
 esac
 case "$target_os" in
   cygwin*|mingw*|*djgpp*|os2-emx*)
-    RUBY_LIB_PREFIX="/lib/ruby"
+    RUBY_LIB_PREFIX="`expr "$libdir" : "$prefix\(/.*\)"`/ruby"
     ;;
   *)
-    RUBY_LIB_PREFIX="${prefix}/lib/ruby"
+    RUBY_LIB_PREFIX="${libdir}/ruby"
     ;;
 esac
 RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}.${TEENY}"
@@ -1727,7 +1727,7 @@
 AC_ARG_WITH(sitedir,
 	    [  --with-sitedir=DIR      site libraries in DIR [PREFIX/lib/ruby/site_ruby]],
             [sitedir=$withval],
-            [sitedir='${prefix}/lib/ruby/site_ruby'])
+            [sitedir='${libdir}/ruby/site_ruby'])
 SITE_DIR=`eval echo \\"${sitedir}\\"`
 case "$target_os" in
   cygwin*|mingw*|*djgpp*|os2-emx*)
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15776)
+++ ChangeLog	(revision 15777)
@@ -1,3 +1,7 @@
+Fri Mar 14 15:49:05 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (RUBY_LIB_PREFIX): use libdir.
+
 Fri Mar 14 14:24:15 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/digest/defs.h: inttypes.h is still needed.
Index: ruby_1_8/configure.in
===================================================================
--- ruby_1_8/configure.in	(revision 15776)
+++ ruby_1_8/configure.in	(revision 15777)
@@ -1620,10 +1620,10 @@
 esac
 case "$target_os" in
   cygwin*|mingw*|*djgpp*|os2-emx*)
-    RUBY_LIB_PREFIX="/lib/ruby"
+    RUBY_LIB_PREFIX="`expr "$libdir" : "$prefix\(/.*\)"`/ruby"
     ;;
   *)
-    RUBY_LIB_PREFIX="${prefix}/lib/ruby"
+    RUBY_LIB_PREFIX="${libdir}/ruby"
     ;;
 esac
 RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
@@ -1631,7 +1631,7 @@
 AC_ARG_WITH(sitedir,
 	    [  --with-sitedir=DIR      site libraries in DIR [PREFIX/lib/ruby/site_ruby]],
             [sitedir=$withval],
-            [sitedir='${prefix}/lib/ruby/site_ruby'])
+            [sitedir='${libdir}/ruby/site_ruby'])
 SITE_DIR=`eval echo \\"${sitedir}\\"`
 case "$target_os" in
   cygwin*|mingw*|*djgpp*|os2-emx*)
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 15776)
+++ ruby_1_8/ChangeLog	(revision 15777)
@@ -1,3 +1,7 @@
+Fri Mar 14 15:49:05 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (RUBY_LIB_PREFIX): use libdir.
+
 Fri Mar 14 10:12:29 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in (RUBY_CHECK_VARTYPE): should not indent preprocessor

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