nobu	2009-04-04 07:38:54 +0900 (Sat, 04 Apr 2009)

  New Revision: 23133

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23133

  Log:
    * mkconfig.rb (sitearch): default to arch.

  Modified files:
    trunk/ChangeLog
    trunk/mkconfig.rb
    trunk/version.h

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 23132)
+++ ChangeLog	(revision 23133)
@@ -1,3 +1,7 @@
+Sat Apr  4 07:38:52 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* mkconfig.rb (sitearch): default to arch.
+
 Fri Apr  3 14:02:42 2009  Akinori MUSHA  <knu@i...>
 
 	* lib/irb/completion.rb (IRB::InputCompletor::Operators): Add
Index: mkconfig.rb
===================================================================
--- mkconfig.rb	(revision 23132)
+++ mkconfig.rb	(revision 23133)
@@ -69,15 +69,20 @@
   end
 
   if name
-    next if /^(?:ac_.*|configure_input|(?:top_)?srcdir|\w+OBJS)$/ =~ name
-    next if /^\$\(ac_\w+\)$/ =~ val
-    next if /^\$\{ac_\w+\}$/ =~ val
-    next if /^\$ac_\w+$/ =~ val
-    next if $install_name and /^RUBY_INSTALL_NAME$/ =~ name
-    next if $so_name and /^RUBY_SO_NAME$/ =~  name
-    next if /^(?:X|(?:MINI|RUN)RUBY$)/ =~ name
-    next if /^(?:MAJOR|MINOR|TEENY)$/ =~ name
-    arch = val if name == "arch"
+    case name
+    when /^(?:ac_.*|configure_input|(?:top_)?srcdir|\w+OBJS)$/; next
+    when /^(?:X|(?:MINI|RUN)RUBY$)/; next
+    when /^(?:MAJOR|MINOR|TEENY)$/; next
+    when /^RUBY_INSTALL_NAME$/; next if $install_name
+    when /^RUBY_SO_NAME$/; next if $so_name
+    when /^arch$/; if val.empty? then val = arch else arch = val end
+    when /^sitearch/; val = '$(arch)' if val.empty?
+    end
+    case val
+    when /^\$\(ac_\w+\)$/; next
+    when /^\$\{ac_\w+\}$/; next
+    when /^\$ac_\w+$/; next
+    end
     if /^program_transform_name$/ =~ name and /^s(\\?.)(.*)\1$/ =~ val
       next if $install_name
       sep = %r"#{Regexp.quote($1)}"
Index: version.h
===================================================================
--- version.h	(revision 23132)
+++ version.h	(revision 23133)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_RELEASE_DATE "2009-04-03"
+#define RUBY_RELEASE_DATE "2009-04-04"
 #define RUBY_PATCHLEVEL -1
 #define RUBY_BRANCH_NAME "trunk"
 
@@ -8,7 +8,7 @@
 #define RUBY_VERSION_TEENY 1
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 3
+#define RUBY_RELEASE_DAY 4
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];

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