From: nobu.nakada@...
Date: 2000-02-10T07:50:09+09:00
Subject: [ruby-dev:9178] Re: site_ruby

なかだです。

At Wed, 9 Feb 2000 11:34:12 +0900,
matz@netlab.co.jp (Yukihiro Matsumoto) wrote:
> |>> /usr/local/lib/ruby/site_ruby/1.4/i586-linux
> |>> /usr/local/lib/ruby/site_ruby/1.4
> |>> /usr/local/lib/ruby/site_ruby
> |>> /usr/local/lib/ruby/1.4/i586-linux
> |>> /usr/local/lib/ruby/1.4
> 
> |納得です。ぼくも上の順番に賛成します。
> 
> 上記の順番で合意が得られたようですね。その線で書き換えましょ
> う。時間がとれたら。パッチ歓迎。

  んじゃ。


Index: ChangeLog
===================================================================
RCS file: /home/cvs/ruby/ChangeLog,v
retrieving revision 1.39
diff -u -2 -p -r1.39 ChangeLog
--- ChangeLog	2000/02/08 08:48:43	1.39
+++ ChangeLog	2000/02/09 22:42:08
@@ -1,2 +1,12 @@
+Thu Feb 10 07:40:14 2000  Nakada.Nobuyoshi  <nobu.nokada@softhome.net>
+
+	* configure.in (RUBY_SITE_LIB_PATH): formed
+	  ruby/site_ruby/VERSION from ruby/VERSION/site_ruby.
+
+	* configure.in (RUBY_SITE_RUBY_PATH): added.
+
+	* ruby.c (ruby_prog_init): inserted RUBY_SITE_RUBY into search
+	  path.
+
 Tue Feb  8 02:07:33 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 

Index: configure.in
===================================================================
RCS file: /home/cvs/ruby/configure.in,v
retrieving revision 1.13
diff -u -2 -p -r1.13 configure.in
--- configure.in	2000/02/08 08:48:45	1.13
+++ configure.in	2000/02/09 22:23:21
@@ -801,5 +801,7 @@ RUBY_INSTALL_NAME="${ri_prefix}ruby${ri_
 RUBY_LIB_PATH="${prefix}/lib/ruby/${MAJOR}.${MINOR}"
 AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}")
-RUBY_SITE_LIB_PATH="${RUBY_LIB_PATH}/site_ruby"
+RUBY_SITE_RUBY_PATH="${prefix}/lib/ruby/site_ruby"
+RUBY_SITE_LIB_PATH="${RUBY_SITE_RUBY_PATH}/${MAJOR}.${MINOR}"
+AC_DEFINE_UNQUOTED(RUBY_SITE_RUBY, "${RUBY_SITE_RUBY_PATH}")
 AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}")
 AC_SUBST(arch)dnl

Index: ruby.c
===================================================================
RCS file: /home/cvs/ruby/ruby.c,v
retrieving revision 1.14
diff -u -2 -p -r1.14 ruby.c
--- ruby.c	2000/01/05 04:37:11	1.14
+++ ruby.c	2000/02/09 22:30:15
@@ -938,4 +938,7 @@ ruby_prog_init()
 #endif
 
+#ifdef RUBY_SITE_RUBY
+    addpath(RUBY_SITE_RUBY);
+#endif
     addpath(RUBY_SITE_LIB);
 #ifdef RUBY_SITE_ARCHLIB

-- 
そうだ 強気に ちょっと インチキに☆彡
    中田 "Bugるくらいがちょうどいいかも;-)" 伸悦